Merge branch '2.0.x' into 2.1.x

Closes gh-17078

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,14 +38,13 @@ public class RemoteUrlPropertyExtractorTests {
 
 	@After
 	public void preventRunFailuresFromPollutingLoggerContext() {
-		((Logger) LoggerFactory.getLogger(RemoteUrlPropertyExtractorTests.class))
-				.getLoggerContext().getTurboFilterList().clear();
+		((Logger) LoggerFactory.getLogger(RemoteUrlPropertyExtractorTests.class)).getLoggerContext()
+				.getTurboFilterList().clear();
 	}
 
 	@Test
 	public void missingUrl() {
-		assertThatIllegalStateException().isThrownBy(() -> doTest())
-				.withMessageContaining("No remote URL specified");
+		assertThatIllegalStateException().isThrownBy(() -> doTest()).withMessageContaining("No remote URL specified");
 	}
 
 	@Test
@@ -57,26 +56,21 @@ public class RemoteUrlPropertyExtractorTests {
 
 	@Test
 	public void multipleUrls() {
-		assertThatIllegalStateException()
-				.isThrownBy(
-						() -> doTest("http://localhost:8080", "http://localhost:9090"))
+		assertThatIllegalStateException().isThrownBy(() -> doTest("http://localhost:8080", "http://localhost:9090"))
 				.withMessageContaining("Multiple URLs specified");
 	}
 
 	@Test
 	public void validUrl() {
 		ApplicationContext context = doTest("http://localhost:8080");
-		assertThat(context.getEnvironment().getProperty("remoteUrl"))
-				.isEqualTo("http://localhost:8080");
-		assertThat(context.getEnvironment().getProperty("spring.thymeleaf.cache"))
-				.isNull();
+		assertThat(context.getEnvironment().getProperty("remoteUrl")).isEqualTo("http://localhost:8080");
+		assertThat(context.getEnvironment().getProperty("spring.thymeleaf.cache")).isNull();
 	}
 
 	@Test
 	public void cleanValidUrl() {
 		ApplicationContext context = doTest("http://localhost:8080/");
-		assertThat(context.getEnvironment().getProperty("remoteUrl"))
-				.isEqualTo("http://localhost:8080");
+		assertThat(context.getEnvironment().getProperty("remoteUrl")).isEqualTo("http://localhost:8080");
 	}
 
 	private ApplicationContext doTest(String... args) {

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +50,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 
 	@Test
 	public void singleManuallyConfiguredDataSourceIsNotClosed() throws SQLException {
-		ConfigurableApplicationContext context = createContext(
-				SingleDataSourceConfiguration.class);
+		ConfigurableApplicationContext context = createContext(SingleDataSourceConfiguration.class);
 		DataSource dataSource = context.getBean(DataSource.class);
 		Statement statement = configureDataSourceBehavior(dataSource);
 		verify(statement, never()).execute("SHUTDOWN");
@@ -59,10 +58,8 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 
 	@Test
 	public void multipleDataSourcesAreIgnored() throws SQLException {
-		ConfigurableApplicationContext context = createContext(
-				MultipleDataSourcesConfiguration.class);
-		Collection<DataSource> dataSources = context.getBeansOfType(DataSource.class)
-				.values();
+		ConfigurableApplicationContext context = createContext(MultipleDataSourcesConfiguration.class);
+		Collection<DataSource> dataSources = context.getBeansOfType(DataSource.class).values();
 		for (DataSource dataSource : dataSources) {
 			Statement statement = configureDataSourceBehavior(dataSource);
 			verify(statement, never()).execute("SHUTDOWN");
@@ -73,16 +70,14 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 	public void emptyFactoryMethodMetadataIgnored() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		DataSource dataSource = mock(DataSource.class);
-		AnnotatedGenericBeanDefinition beanDefinition = new AnnotatedGenericBeanDefinition(
-				dataSource.getClass());
+		AnnotatedGenericBeanDefinition beanDefinition = new AnnotatedGenericBeanDefinition(dataSource.getClass());
 		context.registerBeanDefinition("dataSource", beanDefinition);
 		context.register(DevToolsDataSourceAutoConfiguration.class);
 		context.refresh();
 		context.close();
 	}
 
-	protected final Statement configureDataSourceBehavior(DataSource dataSource)
-			throws SQLException {
+	protected final Statement configureDataSourceBehavior(DataSource dataSource) throws SQLException {
 		Connection connection = mock(Connection.class);
 		Statement statement = mock(Statement.class);
 		doReturn(connection).when(dataSource).getConnection();
@@ -94,20 +89,17 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 		return this.createContext(null, classes);
 	}
 
-	protected final ConfigurableApplicationContext createContext(String driverClassName,
-			Class<?>... classes) {
+	protected final ConfigurableApplicationContext createContext(String driverClassName, Class<?>... classes) {
 		return this.createContext(driverClassName, null, classes);
 	}
 
-	protected final ConfigurableApplicationContext createContext(String driverClassName,
-			String url, Class<?>... classes) {
+	protected final ConfigurableApplicationContext createContext(String driverClassName, String url,
+			Class<?>... classes) {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.register(classes);
 		context.register(DevToolsDataSourceAutoConfiguration.class);
 		if (driverClassName != null) {
-			TestPropertyValues
-					.of("spring.datasource.driver-class-name:" + driverClassName)
-					.applyTo(context);
+			TestPropertyValues.of("spring.datasource.driver-class-name:" + driverClassName).applyTo(context);
 		}
 		if (url != null) {
 			TestPropertyValues.of("spring.datasource.url:" + url).applyTo(context);
@@ -154,8 +146,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 	private static class DataSourceSpyBeanPostProcessor implements BeanPostProcessor {
 
 		@Override
-		public Object postProcessBeforeInitialization(Object bean, String beanName)
-				throws BeansException {
+		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			if (bean instanceof DataSource) {
 				bean = spy(bean);
 			}
@@ -163,8 +154,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
 		}
 
 		@Override
-		public Object postProcessAfterInitialization(Object bean, String beanName)
-				throws BeansException {
+		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,15 +39,13 @@ import static org.mockito.Mockito.verify;
  */
 @RunWith(ModifiedClassPathRunner.class)
 @ClassPathExclusions("HikariCP-*.jar")
-public class DevToolsEmbeddedDataSourceAutoConfigurationTests
-		extends AbstractDevToolsDataSourceAutoConfigurationTests {
+public class DevToolsEmbeddedDataSourceAutoConfigurationTests extends AbstractDevToolsDataSourceAutoConfigurationTests {
 
 	@Test
 	public void autoConfiguredDataSourceIsNotShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext(
-				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext(DataSourceAutoConfiguration.class,
+				DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, never()).execute("SHUTDOWN");
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Andy Wilkinson
  */
-public class DevToolsPooledDataSourceAutoConfigurationTests
-		extends AbstractDevToolsDataSourceAutoConfigurationTests {
+public class DevToolsPooledDataSourceAutoConfigurationTests extends AbstractDevToolsDataSourceAutoConfigurationTests {
 
 	@Before
 	public void before() {
@@ -52,10 +51,9 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
 
 	@Test
 	public void autoConfiguredInMemoryDataSourceIsShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext(
-				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext(DataSourceAutoConfiguration.class,
+				DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement).execute("SHUTDOWN");
 	}
@@ -64,74 +62,61 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
 	public void autoConfiguredExternalDataSourceIsNotShutdown() throws SQLException {
 		ConfigurableApplicationContext context = createContext("org.postgresql.Driver",
 				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, never()).execute("SHUTDOWN");
 	}
 
 	@Test
 	public void h2ServerIsNotShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext("org.h2.Driver",
-				"jdbc:h2:hsql://localhost", DataSourceAutoConfiguration.class,
-				DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext("org.h2.Driver", "jdbc:h2:hsql://localhost",
+				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, never()).execute("SHUTDOWN");
 	}
 
 	@Test
 	public void inMemoryH2IsShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext("org.h2.Driver",
-				"jdbc:h2:mem:test", DataSourceAutoConfiguration.class,
-				DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext("org.h2.Driver", "jdbc:h2:mem:test",
+				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, times(1)).execute("SHUTDOWN");
 	}
 
 	@Test
 	public void hsqlServerIsNotShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext("org.hsqldb.jdbcDriver",
-				"jdbc:hsqldb:hsql://localhost", DataSourceAutoConfiguration.class,
-				DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext("org.hsqldb.jdbcDriver", "jdbc:hsqldb:hsql://localhost",
+				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, never()).execute("SHUTDOWN");
 	}
 
 	@Test
 	public void inMemoryHsqlIsShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext("org.hsqldb.jdbcDriver",
-				"jdbc:hsqldb:mem:test", DataSourceAutoConfiguration.class,
-				DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:test",
+				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, times(1)).execute("SHUTDOWN");
 	}
 
 	@Test
 	public void derbyClientIsNotShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext(
-				"org.apache.derby.jdbc.ClientDriver", "jdbc:derby://localhost",
-				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext("org.apache.derby.jdbc.ClientDriver",
+				"jdbc:derby://localhost", DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, never()).execute("SHUTDOWN");
 	}
 
 	@Test
 	public void inMemoryDerbyIsShutdown() throws SQLException {
-		ConfigurableApplicationContext context = createContext(
-				"org.apache.derby.jdbc.EmbeddedDriver", "jdbc:derby:memory:test",
-				DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
-		Statement statement = configureDataSourceBehavior(
-				context.getBean(DataSource.class));
+		ConfigurableApplicationContext context = createContext("org.apache.derby.jdbc.EmbeddedDriver",
+				"jdbc:derby:memory:test", DataSourceAutoConfiguration.class, DataSourceSpyConfiguration.class);
+		Statement statement = configureDataSourceBehavior(context.getBean(DataSource.class));
 		context.close();
 		verify(statement, times(1)).execute("SHUTDOWN");
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertiesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,8 @@ public class DevToolsPropertiesTests {
 	public void additionalExcludeKeepsDefaults() {
 		DevToolsProperties.Restart restart = this.devToolsProperties.getRestart();
 		restart.setAdditionalExclude("foo/**,bar/**");
-		assertThat(restart.getAllExclude()).containsOnly("META-INF/maven/**",
-				"META-INF/resources/**", "resources/**", "static/**", "public/**",
-				"templates/**", "**/*Test.class", "**/*Tests.class", "git.properties",
+		assertThat(restart.getAllExclude()).containsOnly("META-INF/maven/**", "META-INF/resources/**", "resources/**",
+				"static/**", "public/**", "templates/**", "**/*Test.class", "**/*Tests.class", "git.properties",
 				"META-INF/build-info.properties", "foo/**", "bar/**");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/HateoasObjenesisCacheDisablerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,9 @@ public class HateoasObjenesisCacheDisablerTests {
 	@Before
 	@After
 	public void resetCacheField() {
-		ReflectionTestUtils.setField(HateoasObjenesisCacheDisabler.class, "cacheDisabled",
-				false);
-		this.objenesis = (ObjenesisStd) ReflectionTestUtils
-				.getField(DummyInvocationUtils.class, "OBJENESIS");
-		ReflectionTestUtils.setField(this.objenesis, "cache",
-				new ConcurrentHashMap<String, ObjectInstantiator<?>>());
+		ReflectionTestUtils.setField(HateoasObjenesisCacheDisabler.class, "cacheDisabled", false);
+		this.objenesis = (ObjenesisStd) ReflectionTestUtils.getField(DummyInvocationUtils.class, "OBJENESIS");
+		ReflectionTestUtils.setField(this.objenesis, "cache", new ConcurrentHashMap<String, ObjectInstantiator<?>>());
 	}
 
 	@Test

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,28 +86,24 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Test
 	public void thymeleafCacheIsFalse() {
 		this.context = initializeAndRun(Config.class);
-		SpringResourceTemplateResolver resolver = this.context
-				.getBean(SpringResourceTemplateResolver.class);
+		SpringResourceTemplateResolver resolver = this.context.getBean(SpringResourceTemplateResolver.class);
 		assertThat(resolver.isCacheable()).isFalse();
 	}
 
 	@Test
 	public void defaultPropertyCanBeOverriddenFromCommandLine() {
 		this.context = initializeAndRun(Config.class, "--spring.thymeleaf.cache=true");
-		SpringResourceTemplateResolver resolver = this.context
-				.getBean(SpringResourceTemplateResolver.class);
+		SpringResourceTemplateResolver resolver = this.context.getBean(SpringResourceTemplateResolver.class);
 		assertThat(resolver.isCacheable()).isTrue();
 	}
 
 	@Test
 	public void defaultPropertyCanBeOverriddenFromUserHomeProperties() {
 		String userHome = System.getProperty("user.home");
-		System.setProperty("user.home",
-				new File("src/test/resources/user-home").getAbsolutePath());
+		System.setProperty("user.home", new File("src/test/resources/user-home").getAbsolutePath());
 		try {
 			this.context = initializeAndRun(Config.class);
-			SpringResourceTemplateResolver resolver = this.context
-					.getBean(SpringResourceTemplateResolver.class);
+			SpringResourceTemplateResolver resolver = this.context.getBean(SpringResourceTemplateResolver.class);
 			assertThat(resolver.isCacheable()).isTrue();
 		}
 		finally {
@@ -143,8 +139,7 @@ public class LocalDevToolsAutoConfigurationTests {
 		this.context = initializeAndRun(ConfigWithMockLiveReload.class);
 		LiveReloadServer server = this.context.getBean(LiveReloadServer.class);
 		reset(server);
-		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
-				Collections.emptySet(), false);
+		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, Collections.emptySet(), false);
 		this.context.publishEvent(event);
 		verify(server).triggerReload();
 	}
@@ -154,8 +149,7 @@ public class LocalDevToolsAutoConfigurationTests {
 		this.context = initializeAndRun(ConfigWithMockLiveReload.class);
 		LiveReloadServer server = this.context.getBean(LiveReloadServer.class);
 		reset(server);
-		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
-				Collections.emptySet(), true);
+		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, Collections.emptySet(), true);
 		this.context.publishEvent(event);
 		verify(server, never()).triggerReload();
 	}
@@ -172,8 +166,7 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Test
 	public void restartTriggeredOnClassPathChangeWithRestart() {
 		this.context = initializeAndRun(Config.class);
-		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
-				Collections.emptySet(), true);
+		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, Collections.emptySet(), true);
 		this.context.publishEvent(event);
 		verify(this.mockRestarter.getMock()).restart(any(FailureHandler.class));
 	}
@@ -181,8 +174,7 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Test
 	public void restartNotTriggeredOnClassPathChangeWithRestart() {
 		this.context = initializeAndRun(Config.class);
-		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
-				Collections.emptySet(), false);
+		ClassPathChangedEvent event = new ClassPathChangedEvent(this.context, Collections.emptySet(), false);
 		this.context.publishEvent(event);
 		verify(this.mockRestarter.getMock(), never()).restart();
 	}
@@ -190,8 +182,7 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Test
 	public void restartWatchingClassPath() {
 		this.context = initializeAndRun(Config.class);
-		ClassPathFileSystemWatcher watcher = this.context
-				.getBean(ClassPathFileSystemWatcher.class);
+		ClassPathFileSystemWatcher watcher = this.context.getBean(ClassPathFileSystemWatcher.class);
 		assertThat(watcher).isNotNull();
 	}
 
@@ -209,10 +200,8 @@ public class LocalDevToolsAutoConfigurationTests {
 		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.devtools.restart.trigger-file", "somefile.txt");
 		this.context = initializeAndRun(Config.class, properties);
-		ClassPathFileSystemWatcher classPathWatcher = this.context
-				.getBean(ClassPathFileSystemWatcher.class);
-		Object watcher = ReflectionTestUtils.getField(classPathWatcher,
-				"fileSystemWatcher");
+		ClassPathFileSystemWatcher classPathWatcher = this.context.getBean(ClassPathFileSystemWatcher.class);
+		Object watcher = ReflectionTestUtils.getField(classPathWatcher, "fileSystemWatcher");
 		Object filter = ReflectionTestUtils.getField(watcher, "triggerFilter");
 		assertThat(filter).isInstanceOf(TriggerFileFilter.class);
 	}
@@ -220,18 +209,13 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Test
 	public void watchingAdditionalPaths() {
 		Map<String, Object> properties = new HashMap<>();
-		properties.put("spring.devtools.restart.additional-paths",
-				"src/main/java,src/test/java");
+		properties.put("spring.devtools.restart.additional-paths", "src/main/java,src/test/java");
 		this.context = initializeAndRun(Config.class, properties);
-		ClassPathFileSystemWatcher classPathWatcher = this.context
-				.getBean(ClassPathFileSystemWatcher.class);
-		Object watcher = ReflectionTestUtils.getField(classPathWatcher,
-				"fileSystemWatcher");
+		ClassPathFileSystemWatcher classPathWatcher = this.context.getBean(ClassPathFileSystemWatcher.class);
+		Object watcher = ReflectionTestUtils.getField(classPathWatcher, "fileSystemWatcher");
 		@SuppressWarnings("unchecked")
-		Map<File, Object> folders = (Map<File, Object>) ReflectionTestUtils
-				.getField(watcher, "folders");
-		assertThat(folders).hasSize(2)
-				.containsKey(new File("src/main/java").getAbsoluteFile())
+		Map<File, Object> folders = (Map<File, Object>) ReflectionTestUtils.getField(watcher, "folders");
+		assertThat(folders).hasSize(2).containsKey(new File("src/main/java").getAbsoluteFile())
 				.containsKey(new File("src/test/java").getAbsoluteFile());
 	}
 
@@ -247,13 +231,12 @@ public class LocalDevToolsAutoConfigurationTests {
 		assertThat(options.getDevelopment()).isTrue();
 	}
 
-	private ConfigurableApplicationContext initializeAndRun(Class<?> config,
-			String... args) {
+	private ConfigurableApplicationContext initializeAndRun(Class<?> config, String... args) {
 		return initializeAndRun(config, Collections.emptyMap(), args);
 	}
 
-	private ConfigurableApplicationContext initializeAndRun(Class<?> config,
-			Map<String, Object> properties, String... args) {
+	private ConfigurableApplicationContext initializeAndRun(Class<?> config, Map<String, Object> properties,
+			String... args) {
 		Restarter.initialize(new String[0], false, new MockRestartInitializer(), false);
 		SpringApplication application = new SpringApplication(config);
 		application.setDefaultProperties(getDefaultProperties(properties));
@@ -261,8 +244,7 @@ public class LocalDevToolsAutoConfigurationTests {
 		return context;
 	}
 
-	private Map<String, Object> getDefaultProperties(
-			Map<String, Object> specifiedProperties) {
+	private Map<String, Object> getDefaultProperties(Map<String, Object> specifiedProperties) {
 		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.thymeleaf.check-template-location", false);
 		properties.put("spring.devtools.livereload.port", 0);
@@ -272,15 +254,15 @@ public class LocalDevToolsAutoConfigurationTests {
 	}
 
 	@Configuration
-	@Import({ ServletWebServerFactoryAutoConfiguration.class,
-			LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class })
+	@Import({ ServletWebServerFactoryAutoConfiguration.class, LocalDevToolsAutoConfiguration.class,
+			ThymeleafAutoConfiguration.class })
 	public static class Config {
 
 	}
 
 	@Configuration
-	@ImportAutoConfiguration({ ServletWebServerFactoryAutoConfiguration.class,
-			LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class })
+	@ImportAutoConfiguration({ ServletWebServerFactoryAutoConfiguration.class, LocalDevToolsAutoConfiguration.class,
+			ThymeleafAutoConfiguration.class })
 	public static class ConfigWithMockLiveReload {
 
 		@Bean
@@ -291,8 +273,8 @@ public class LocalDevToolsAutoConfigurationTests {
 	}
 
 	@Configuration
-	@Import({ ServletWebServerFactoryAutoConfiguration.class,
-			LocalDevToolsAutoConfiguration.class, ResourceProperties.class })
+	@Import({ ServletWebServerFactoryAutoConfiguration.class, LocalDevToolsAutoConfiguration.class,
+			ResourceProperties.class })
 	public static class WebResourcesConfig {
 
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,8 +128,7 @@ public class RemoteDevToolsAutoConfigurationTests {
 
 	@Test
 	public void invokeRestartWithCustomServerContextPath() throws Exception {
-		loadContext("spring.devtools.remote.secret:supersecret",
-				"server.servlet.context-path:/test");
+		loadContext("spring.devtools.remote.secret:supersecret", "server.servlet.context-path:/test");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI("/test" + DEFAULT_CONTEXT_PATH + "/restart");
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret");
@@ -139,8 +138,7 @@ public class RemoteDevToolsAutoConfigurationTests {
 
 	@Test
 	public void disableRestart() {
-		loadContext("spring.devtools.remote.secret:supersecret",
-				"spring.devtools.remote.restart.enabled:false");
+		loadContext("spring.devtools.remote.secret:supersecret", "spring.devtools.remote.restart.enabled:false");
 		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
 				.isThrownBy(() -> this.context.getBean("remoteRestartHandlerMapper"));
 	}
@@ -158,8 +156,7 @@ public class RemoteDevToolsAutoConfigurationTests {
 
 	@Test
 	public void devToolsHealthWithCustomServerContextPathReturns200() throws Exception {
-		loadContext("spring.devtools.remote.secret:supersecret",
-				"server.servlet.context-path:/test");
+		loadContext("spring.devtools.remote.secret:supersecret", "server.servlet.context-path:/test");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI("/test" + DEFAULT_CONTEXT_PATH);
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret");
@@ -169,8 +166,7 @@ public class RemoteDevToolsAutoConfigurationTests {
 	}
 
 	private void assertRestartInvoked(boolean value) {
-		assertThat(this.context.getBean(MockHttpRestartServer.class).invoked)
-				.isEqualTo(value);
+		assertThat(this.context.getBean(MockHttpRestartServer.class).invoked).isEqualTo(value);
 	}
 
 	private void loadContext(String... properties) {
@@ -187,8 +183,7 @@ public class RemoteDevToolsAutoConfigurationTests {
 
 		@Bean
 		public HttpRestartServer remoteRestartHttpRestartServer() {
-			SourceFolderUrlFilter sourceFolderUrlFilter = mock(
-					SourceFolderUrlFilter.class);
+			SourceFolderUrlFilter sourceFolderUrlFilter = mock(SourceFolderUrlFilter.class);
 			return new MockHttpRestartServer(sourceFolderUrlFilter);
 		}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,16 +37,14 @@ public class ClassPathChangedEventTests {
 
 	@Test
 	public void changeSetMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathChangedEvent(this.source, null, false))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassPathChangedEvent(this.source, null, false))
 				.withMessageContaining("ChangeSet must not be null");
 	}
 
 	@Test
 	public void getChangeSet() {
 		Set<ChangedFiles> changeSet = new LinkedHashSet<>();
-		ClassPathChangedEvent event = new ClassPathChangedEvent(this.source, changeSet,
-				false);
+		ClassPathChangedEvent event = new ClassPathChangedEvent(this.source, changeSet, false);
 		assertThat(event.getChangeSet()).isSameAs(changeSet);
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,16 +67,14 @@ public class ClassPathFileChangeListenerTests {
 	@Test
 	public void eventPublisherMustNotBeNull() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathFileChangeListener(null,
-						this.restartStrategy, this.fileSystemWatcher))
+				.isThrownBy(() -> new ClassPathFileChangeListener(null, this.restartStrategy, this.fileSystemWatcher))
 				.withMessageContaining("EventPublisher must not be null");
 	}
 
 	@Test
 	public void restartStrategyMustNotBeNull() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathFileChangeListener(this.eventPublisher,
-						null, this.fileSystemWatcher))
+				.isThrownBy(() -> new ClassPathFileChangeListener(this.eventPublisher, null, this.fileSystemWatcher))
 				.withMessageContaining("RestartStrategy must not be null");
 	}
 
@@ -93,8 +91,8 @@ public class ClassPathFileChangeListenerTests {
 	}
 
 	private void testSendsEvent(boolean restart) {
-		ClassPathFileChangeListener listener = new ClassPathFileChangeListener(
-				this.eventPublisher, this.restartStrategy, this.fileSystemWatcher);
+		ClassPathFileChangeListener listener = new ClassPathFileChangeListener(this.eventPublisher,
+				this.restartStrategy, this.fileSystemWatcher);
 		File folder = new File("s1");
 		File file = new File("f1");
 		ChangedFile file1 = new ChangedFile(folder, file, ChangedFile.Type.ADD);
@@ -109,8 +107,7 @@ public class ClassPathFileChangeListenerTests {
 		}
 		listener.onChange(changeSet);
 		verify(this.eventPublisher).publishEvent(this.eventCaptor.capture());
-		ClassPathChangedEvent actualEvent = (ClassPathChangedEvent) this.eventCaptor
-				.getValue();
+		ClassPathChangedEvent actualEvent = (ClassPathChangedEvent) this.eventCaptor.getValue();
 		assertThat(actualEvent.getChangeSet()).isEqualTo(changeSet);
 		assertThat(actualEvent.isRestartRequired()).isEqualTo(restart);
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java

@@ -55,8 +55,7 @@ public class ClassPathFileSystemWatcherTests {
 	@Test
 	public void urlsMustNotBeNull() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathFileSystemWatcher(
-						mock(FileSystemWatcherFactory.class),
+				.isThrownBy(() -> new ClassPathFileSystemWatcher(mock(FileSystemWatcherFactory.class),
 						mock(ClassPathRestartStrategy.class), (URL[]) null))
 				.withMessageContaining("Urls must not be null");
 	}
@@ -86,8 +85,8 @@ public class ClassPathFileSystemWatcherTests {
 			Thread.sleep(500);
 		}
 		assertThat(events.size()).isEqualTo(1);
-		assertThat(events.get(0).getChangeSet().iterator().next().getFiles().iterator()
-				.next().getFile()).isEqualTo(classFile);
+		assertThat(events.get(0).getChangeSet().iterator().next().getFiles().iterator().next().getFile())
+				.isEqualTo(classFile);
 		context.close();
 	}
 
@@ -102,11 +101,9 @@ public class ClassPathFileSystemWatcherTests {
 
 		@Bean
 		public ClassPathFileSystemWatcher watcher() {
-			FileSystemWatcher watcher = new FileSystemWatcher(false,
-					Duration.ofMillis(100), Duration.ofMillis(10));
+			FileSystemWatcher watcher = new FileSystemWatcher(false, Duration.ofMillis(100), Duration.ofMillis(10));
 			URL[] urls = this.environment.getProperty("urls", URL[].class);
-			return new ClassPathFileSystemWatcher(
-					new MockFileSystemWatcherFactory(watcher), restartStrategy(), urls);
+			return new ClassPathFileSystemWatcher(new MockFileSystemWatcherFactory(watcher), restartStrategy(), urls);
 		}
 
 		@Bean
@@ -136,8 +133,7 @@ public class ClassPathFileSystemWatcherTests {
 
 	}
 
-	private static class MockFileSystemWatcherFactory
-			implements FileSystemWatcherFactory {
+	private static class MockFileSystemWatcherFactory implements FileSystemWatcherFactory {
 
 		private final FileSystemWatcher watcher;
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,8 +76,7 @@ public class PatternClassPathRestartStrategyTests {
 
 	@Test
 	public void testChange() {
-		ClassPathRestartStrategy strategy = createStrategy(
-				"**/*Test.class,**/*Tests.class");
+		ClassPathRestartStrategy strategy = createStrategy("**/*Test.class,**/*Tests.class");
 		assertRestartRequired(strategy, "com/example/ExampleTests.class", false);
 		assertRestartRequired(strategy, "com/example/ExampleTest.class", false);
 		assertRestartRequired(strategy, "com/example/Example.class", true);
@@ -87,10 +86,8 @@ public class PatternClassPathRestartStrategyTests {
 		return new PatternClassPathRestartStrategy(pattern);
 	}
 
-	private void assertRestartRequired(ClassPathRestartStrategy strategy,
-			String relativeName, boolean expected) {
-		assertThat(strategy.isRestartRequired(mockFile(relativeName)))
-				.isEqualTo(expected);
+	private void assertRestartRequired(ClassPathRestartStrategy strategy, String relativeName, boolean expected) {
+		assertThat(strategy.isRestartRequired(mockFile(relativeName))).isEqualTo(expected);
 	}
 
 	private ChangedFile mockFile(String relativeName) {

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,8 +62,7 @@ public class DevToolPropertiesIntegrationTests {
 
 	@Test
 	public void classPropertyConditionIsAffectedByDevToolProperties() {
-		SpringApplication application = new SpringApplication(
-				ClassConditionConfiguration.class);
+		SpringApplication application = new SpringApplication(ClassConditionConfiguration.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		this.context = application.run();
 		this.context.getBean(ClassConditionConfiguration.class);
@@ -71,8 +70,7 @@ public class DevToolPropertiesIntegrationTests {
 
 	@Test
 	public void beanMethodPropertyConditionIsAffectedByDevToolProperties() {
-		SpringApplication application = new SpringApplication(
-				BeanConditionConfiguration.class);
+		SpringApplication application = new SpringApplication(BeanConditionConfiguration.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		this.context = application.run();
 		this.context.getBean(MyBean.class);
@@ -82,8 +80,7 @@ public class DevToolPropertiesIntegrationTests {
 	public void postProcessWhenRestarterDisabledAndRemoteSecretNotSetShouldNotAddPropertySource() {
 		Restarter.clearInstance();
 		Restarter.disable();
-		SpringApplication application = new SpringApplication(
-				BeanConditionConfiguration.class);
+		SpringApplication application = new SpringApplication(BeanConditionConfiguration.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		this.context = application.run();
 		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
@@ -94,11 +91,9 @@ public class DevToolPropertiesIntegrationTests {
 	public void postProcessWhenRestarterDisabledAndRemoteSecretSetShouldAddPropertySource() {
 		Restarter.clearInstance();
 		Restarter.disable();
-		SpringApplication application = new SpringApplication(
-				BeanConditionConfiguration.class);
+		SpringApplication application = new SpringApplication(BeanConditionConfiguration.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		application.setDefaultProperties(
-				Collections.singletonMap("spring.devtools.remote.secret", "donttell"));
+		application.setDefaultProperties(Collections.singletonMap("spring.devtools.remote.secret", "donttell"));
 		this.context = application.run();
 		this.context.getBean(MyBean.class);
 	}
@@ -110,8 +105,7 @@ public class DevToolPropertiesIntegrationTests {
 		this.context = application.run();
 		ConfigurableEnvironment environment = this.context.getEnvironment();
 		String property = environment.getProperty("server.error.include-stacktrace");
-		assertThat(property)
-				.isEqualTo(ErrorProperties.IncludeStacktrace.ALWAYS.toString());
+		assertThat(property).isEqualTo(ErrorProperties.IncludeStacktrace.ALWAYS.toString());
 	}
 
 	@Configuration

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,7 @@ public class DevToolsHomePropertiesPostProcessorTests {
 	public void loadsHomeProperties() throws Exception {
 		Properties properties = new Properties();
 		properties.put("abc", "def");
-		OutputStream out = new FileOutputStream(
-				new File(this.home, ".spring-boot-devtools.properties"));
+		OutputStream out = new FileOutputStream(new File(this.home, ".spring-boot-devtools.properties"));
 		properties.store(out, null);
 		out.close();
 		ConfigurableEnvironment environment = new MockEnvironment();
@@ -72,8 +71,7 @@ public class DevToolsHomePropertiesPostProcessorTests {
 		assertThat(environment.getProperty("abc")).isNull();
 	}
 
-	private class MockDevToolHomePropertiesPostProcessor
-			extends DevToolsHomePropertiesPostProcessor {
+	private class MockDevToolHomePropertiesPostProcessor extends DevToolsHomePropertiesPostProcessor {
 
 		@Override
 		protected File getHomeFolder() {

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/ChangedFileTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,22 +39,20 @@ public class ChangedFileTests {
 
 	@Test
 	public void sourceFolderMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ChangedFile(null, this.temp.newFile(), Type.ADD))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ChangedFile(null, this.temp.newFile(), Type.ADD))
 				.withMessageContaining("SourceFolder must not be null");
 	}
 
 	@Test
 	public void fileMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ChangedFile(this.temp.newFolder(), null, Type.ADD))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ChangedFile(this.temp.newFolder(), null, Type.ADD))
 				.withMessageContaining("File must not be null");
 	}
 
 	@Test
 	public void typeMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new ChangedFile(this.temp.newFile(), this.temp.newFolder(), null))
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new ChangedFile(this.temp.newFile(), this.temp.newFolder(), null))
 				.withMessageContaining("Type must not be null");
 	}
 
@@ -67,8 +65,7 @@ public class ChangedFileTests {
 
 	@Test
 	public void getType() throws Exception {
-		ChangedFile changedFile = new ChangedFile(this.temp.newFolder(),
-				this.temp.newFile(), Type.DELETE);
+		ChangedFile changedFile = new ChangedFile(this.temp.newFolder(), this.temp.newFile(), Type.DELETE);
 		assertThat(changedFile.getType()).isEqualTo(Type.DELETE);
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSnapshotTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,7 @@ public class FileSnapshotTests {
 
 	private static final long TWO_MINS = TimeUnit.MINUTES.toMillis(2);
 
-	private static final long MODIFIED = new Date().getTime()
-			- TimeUnit.DAYS.toMillis(10);
+	private static final long MODIFIED = new Date().getTime() - TimeUnit.DAYS.toMillis(10);
 
 	@Rule
 	public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -53,8 +52,7 @@ public class FileSnapshotTests {
 
 	@Test
 	public void fileMustNotBeAFolder() throws Exception {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new FileSnapshot(this.temporaryFolder.newFolder()))
+		assertThatIllegalArgumentException().isThrownBy(() -> new FileSnapshot(this.temporaryFolder.newFolder()))
 				.withMessageContaining("File must not be a folder");
 	}
 
@@ -98,8 +96,7 @@ public class FileSnapshotTests {
 		return file;
 	}
 
-	private void setupFile(File file, String content, long lastModified)
-			throws IOException {
+	private void setupFile(File file, String content, long lastModified) throws IOException {
 		FileCopyUtils.copy(content.getBytes(), file);
 		file.setLastModified(lastModified);
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,8 +49,7 @@ public class FileSystemWatcherTests {
 
 	private FileSystemWatcher watcher;
 
-	private List<Set<ChangedFiles>> changes = Collections
-			.synchronizedList(new ArrayList<Set<ChangedFiles>>());
+	private List<Set<ChangedFiles>> changes = Collections.synchronizedList(new ArrayList<Set<ChangedFiles>>());
 
 	@Rule
 	public TemporaryFolder temp = new TemporaryFolder();
@@ -63,47 +62,40 @@ public class FileSystemWatcherTests {
 	@Test
 	public void pollIntervalMustBePositive() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new FileSystemWatcher(true, Duration.ofMillis(0),
-						Duration.ofMillis(1)))
+				.isThrownBy(() -> new FileSystemWatcher(true, Duration.ofMillis(0), Duration.ofMillis(1)))
 				.withMessageContaining("PollInterval must be positive");
 	}
 
 	@Test
 	public void quietPeriodMustBePositive() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new FileSystemWatcher(true, Duration.ofMillis(1),
-						Duration.ofMillis(0)))
+				.isThrownBy(() -> new FileSystemWatcher(true, Duration.ofMillis(1), Duration.ofMillis(0)))
 				.withMessageContaining("QuietPeriod must be positive");
 	}
 
 	@Test
 	public void pollIntervalMustBeGreaterThanQuietPeriod() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new FileSystemWatcher(true, Duration.ofMillis(1),
-						Duration.ofMillis(1)))
+				.isThrownBy(() -> new FileSystemWatcher(true, Duration.ofMillis(1), Duration.ofMillis(1)))
 				.withMessageContaining("PollInterval must be greater than QuietPeriod");
 	}
 
 	@Test
 	public void listenerMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.watcher.addListener(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.watcher.addListener(null))
 				.withMessageContaining("FileChangeListener must not be null");
 	}
 
 	@Test
 	public void cannotAddListenerToStartedListener() {
 		this.watcher.start();
-		assertThatIllegalStateException()
-				.isThrownBy(
-						() -> this.watcher.addListener(mock(FileChangeListener.class)))
+		assertThatIllegalStateException().isThrownBy(() -> this.watcher.addListener(mock(FileChangeListener.class)))
 				.withMessageContaining("FileSystemWatcher already started");
 	}
 
 	@Test
 	public void sourceFolderMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.watcher.addSourceFolder(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.watcher.addSourceFolder(null))
 				.withMessageContaining("Folder must not be null");
 	}
 
@@ -111,16 +103,14 @@ public class FileSystemWatcherTests {
 	public void sourceFolderMustNotBeAFile() {
 		File folder = new File("pom.xml");
 		assertThat(folder.isFile()).isTrue();
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.watcher.addSourceFolder(new File("pom.xml")))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.watcher.addSourceFolder(new File("pom.xml")))
 				.withMessageContaining("Folder 'pom.xml' must not be a file");
 	}
 
 	@Test
 	public void cannotAddSourceFolderToStartedListener() throws Exception {
 		this.watcher.start();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> this.watcher.addSourceFolder(this.temp.newFolder()))
+		assertThatIllegalStateException().isThrownBy(() -> this.watcher.addSourceFolder(this.temp.newFolder()))
 				.withMessageContaining("FileSystemWatcher already started");
 	}
 
@@ -262,8 +252,7 @@ public class FileSystemWatcherTests {
 		File file = touch(new File(folder, "file.txt"));
 		File trigger = touch(new File(folder, "trigger.txt"));
 		this.watcher.addSourceFolder(folder);
-		this.watcher.setTriggerFilter(
-				(candidate) -> candidate.getName().equals("trigger.txt"));
+		this.watcher.setTriggerFilter((candidate) -> candidate.getName().equals("trigger.txt"));
 		this.watcher.start();
 		FileCopyUtils.copy("abc".getBytes(), file);
 		Thread.sleep(100);
@@ -278,10 +267,8 @@ public class FileSystemWatcherTests {
 	}
 
 	private void setupWatcher(long pollingInterval, long quietPeriod) {
-		this.watcher = new FileSystemWatcher(false, Duration.ofMillis(pollingInterval),
-				Duration.ofMillis(quietPeriod));
-		this.watcher.addListener(
-				(changeSet) -> FileSystemWatcherTests.this.changes.add(changeSet));
+		this.watcher = new FileSystemWatcher(false, Duration.ofMillis(pollingInterval), Duration.ofMillis(quietPeriod));
+		this.watcher.addListener((changeSet) -> FileSystemWatcherTests.this.changes.add(changeSet));
 	}
 
 	private File startWithNewFolder() throws IOException {

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FolderSnapshotTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,18 +101,15 @@ public class FolderSnapshotTests {
 
 	@Test
 	public void getChangedFilesSnapshotMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.initialSnapshot.getChangedFiles(null, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.initialSnapshot.getChangedFiles(null, null))
 				.withMessageContaining("Snapshot must not be null");
 	}
 
 	@Test
 	public void getChangedFilesSnapshotMustBeTheSameSourceFolder() throws Exception {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.initialSnapshot.getChangedFiles(
-						new FolderSnapshot(createTestFolderStructure()), null))
-				.withMessageContaining(
-						"Snapshot source folder must be '" + this.folder + "'");
+		assertThatIllegalArgumentException().isThrownBy(
+				() -> this.initialSnapshot.getChangedFiles(new FolderSnapshot(createTestFolderStructure()), null))
+				.withMessageContaining("Snapshot source folder must be '" + this.folder + "'");
 	}
 
 	@Test
@@ -131,8 +128,7 @@ public class FolderSnapshotTests {
 		file2.delete();
 		newFile.createNewFile();
 		FolderSnapshot updatedSnapshot = new FolderSnapshot(this.folder);
-		ChangedFiles changedFiles = this.initialSnapshot.getChangedFiles(updatedSnapshot,
-				null);
+		ChangedFiles changedFiles = this.initialSnapshot.getChangedFiles(updatedSnapshot, null);
 		assertThat(changedFiles.getSourceFolder()).isEqualTo(this.folder);
 		assertThat(getChangedFile(changedFiles, file1).getType()).isEqualTo(Type.MODIFY);
 		assertThat(getChangedFile(changedFiles, file2).getType()).isEqualTo(Type.DELETE);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java

@@ -67,8 +67,7 @@ public class HttpTunnelIntegrationTests {
 		context.register(ServerConfiguration.class);
 		context.refresh();
 		String url = "http://localhost:" + context.getWebServer().getPort() + "/hello";
-		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
-				String.class);
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 		context.close();
@@ -80,14 +79,11 @@ public class HttpTunnelIntegrationTests {
 		serverContext.register(ServerConfiguration.class);
 		serverContext.refresh();
 		AnnotationConfigApplicationContext tunnelContext = new AnnotationConfigApplicationContext();
-		TestPropertyValues.of("server.port:" + serverContext.getWebServer().getPort())
-				.applyTo(tunnelContext);
+		TestPropertyValues.of("server.port:" + serverContext.getWebServer().getPort()).applyTo(tunnelContext);
 		tunnelContext.register(TunnelConfiguration.class);
 		tunnelContext.refresh();
-		String url = "http://localhost:"
-				+ tunnelContext.getBean(TestTunnelClient.class).port + "/hello";
-		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
-				String.class);
+		String url = "http://localhost:" + tunnelContext.getBean(TestTunnelClient.class).port + "/hello";
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 		serverContext.close();
@@ -114,13 +110,11 @@ public class HttpTunnelIntegrationTests {
 		}
 
 		@Bean
-		public DispatcherFilter filter(
-				AnnotationConfigServletWebServerApplicationContext context) {
+		public DispatcherFilter filter(AnnotationConfigServletWebServerApplicationContext context) {
 			TargetServerConnection connection = new SocketTargetServerConnection(
 					() -> context.getWebServer().getPort());
 			HttpTunnelServer server = new HttpTunnelServer(connection);
-			HandlerMapper mapper = new UrlHandlerMapper("/httptunnel",
-					new HttpTunnelServerHandler(server));
+			HandlerMapper mapper = new UrlHandlerMapper("/httptunnel", new HttpTunnelServerHandler(server));
 			Collection<HandlerMapper> mappers = Collections.singleton(mapper);
 			Dispatcher dispatcher = new Dispatcher(AccessManager.PERMIT_ALL, mappers);
 			return new DispatcherFilter(dispatcher);
@@ -134,8 +128,7 @@ public class HttpTunnelIntegrationTests {
 		@Bean
 		public TunnelClient tunnelClient(@Value("${server.port}") int serverPort) {
 			String url = "http://localhost:" + serverPort + "/httptunnel";
-			TunnelConnection connection = new HttpTunnelConnection(url,
-					new SimpleClientHttpRequestFactory());
+			TunnelConnection connection = new HttpTunnelConnection(url, new SimpleClientHttpRequestFactory());
 			return new TestTunnelClient(0, connection);
 		}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionInputStreamTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,20 +40,17 @@ public class ConnectionInputStreamTests {
 	public void readHeader() throws Exception {
 		String header = "";
 		for (int i = 0; i < 100; i++) {
-			header += "x-something-" + i
-					+ ": xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+			header += "x-something-" + i + ": xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
 		}
 		String data = header + "\r\n\r\n" + "content\r\n";
-		ConnectionInputStream inputStream = new ConnectionInputStream(
-				new ByteArrayInputStream(data.getBytes()));
+		ConnectionInputStream inputStream = new ConnectionInputStream(new ByteArrayInputStream(data.getBytes()));
 		assertThat(inputStream.readHeader()).isEqualTo(header);
 	}
 
 	@Test
 	public void readFully() throws Exception {
 		byte[] bytes = "the data that we want to read fully".getBytes();
-		LimitedInputStream source = new LimitedInputStream(
-				new ByteArrayInputStream(bytes), 2);
+		LimitedInputStream source = new LimitedInputStream(new ByteArrayInputStream(bytes), 2);
 		ConnectionInputStream inputStream = new ConnectionInputStream(source);
 		byte[] buffer = new byte[bytes.length];
 		inputStream.readFully(buffer, 0, buffer.length);
@@ -62,19 +59,15 @@ public class ConnectionInputStreamTests {
 
 	@Test
 	public void checkedRead() throws Exception {
-		ConnectionInputStream inputStream = new ConnectionInputStream(
-				new ByteArrayInputStream(NO_BYTES));
-		assertThatIOException().isThrownBy(inputStream::checkedRead)
-				.withMessageContaining("End of stream");
+		ConnectionInputStream inputStream = new ConnectionInputStream(new ByteArrayInputStream(NO_BYTES));
+		assertThatIOException().isThrownBy(inputStream::checkedRead).withMessageContaining("End of stream");
 	}
 
 	@Test
 	public void checkedReadArray() throws Exception {
 		byte[] buffer = new byte[100];
-		ConnectionInputStream inputStream = new ConnectionInputStream(
-				new ByteArrayInputStream(NO_BYTES));
-		assertThatIOException()
-				.isThrownBy(() -> inputStream.checkedRead(buffer, 0, buffer.length))
+		ConnectionInputStream inputStream = new ConnectionInputStream(new ByteArrayInputStream(NO_BYTES));
+		assertThatIOException().isThrownBy(() -> inputStream.checkedRead(buffer, 0, buffer.length))
 				.withMessageContaining("End of stream");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/FrameTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,8 +41,7 @@ public class FrameTests {
 
 	@Test
 	public void typeMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new Frame((Frame.Type) null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new Frame((Frame.Type) null))
 				.withMessageContaining("Type must not be null");
 	}
 
@@ -88,16 +87,14 @@ public class FrameTests {
 	@Test
 	public void readFragmentedNotSupported() throws Exception {
 		byte[] bytes = new byte[] { 0x0F };
-		assertThatIllegalStateException()
-				.isThrownBy(() -> Frame.read(newConnectionInputStream(bytes)))
+		assertThatIllegalStateException().isThrownBy(() -> Frame.read(newConnectionInputStream(bytes)))
 				.withMessageContaining("Fragmented frames are not supported");
 	}
 
 	@Test
 	public void readLargeFramesNotSupported() throws Exception {
 		byte[] bytes = new byte[] { (byte) 0x80, (byte) 0xFF };
-		assertThatIllegalStateException()
-				.isThrownBy(() -> Frame.read(newConnectionInputStream(bytes)))
+		assertThatIllegalStateException().isThrownBy(() -> Frame.read(newConnectionInputStream(bytes)))
 				.withMessageContaining("Large frames are not supported");
 	}
 
@@ -111,8 +108,7 @@ public class FrameTests {
 
 	@Test
 	public void readMaskedTextFrame() throws Exception {
-		byte[] bytes = new byte[] { (byte) 0x81, (byte) 0x82, 0x0F, 0x0F, 0x0F, 0x0F,
-				0x4E, 0x4E };
+		byte[] bytes = new byte[] { (byte) 0x81, (byte) 0x82, 0x0F, 0x0F, 0x0F, 0x0F, 0x4E, 0x4E };
 		Frame frame = Frame.read(newConnectionInputStream(bytes));
 		assertThat(frame.getType()).isEqualTo(Frame.Type.TEXT);
 		assertThat(frame.getPayload()).isEqualTo(new byte[] { 0x41, 0x41 });

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,8 +85,7 @@ public class LiveReloadServerTests {
 		this.server.triggerReload();
 		Thread.sleep(200);
 		this.server.stop();
-		assertThat(handler.getMessages().get(0))
-				.contains("http://livereload.com/protocols/official-7");
+		assertThat(handler.getMessages().get(0)).contains("http://livereload.com/protocols/official-7");
 		assertThat(handler.getMessages().get(1)).contains("command\":\"reload\"");
 	}
 
@@ -109,8 +108,7 @@ public class LiveReloadServerTests {
 
 	private void awaitClosedException() throws InterruptedException {
 		long startTime = System.currentTimeMillis();
-		while (this.server.getClosedExceptions().isEmpty()
-				&& System.currentTimeMillis() - startTime < 10000) {
+		while (this.server.getClosedExceptions().isEmpty() && System.currentTimeMillis() - startTime < 10000) {
 			Thread.sleep(100);
 		}
 	}
@@ -164,8 +162,8 @@ public class LiveReloadServerTests {
 		}
 
 		@Override
-		protected Connection createConnection(java.net.Socket socket,
-				InputStream inputStream, OutputStream outputStream) throws IOException {
+		protected Connection createConnection(java.net.Socket socket, InputStream inputStream,
+				OutputStream outputStream) throws IOException {
 			return new MonitoredConnection(socket, inputStream, outputStream);
 		}
 
@@ -177,8 +175,8 @@ public class LiveReloadServerTests {
 
 		private class MonitoredConnection extends Connection {
 
-			MonitoredConnection(java.net.Socket socket, InputStream inputStream,
-					OutputStream outputStream) throws IOException {
+			MonitoredConnection(java.net.Socket socket, InputStream inputStream, OutputStream outputStream)
+					throws IOException {
 				super(socket, inputStream, outputStream);
 			}
 
@@ -212,8 +210,7 @@ public class LiveReloadServerTests {
 		private CloseStatus closeStatus;
 
 		@Override
-		public void afterConnectionEstablished(WebSocketSession session)
-				throws Exception {
+		public void afterConnectionEstablished(WebSocketSession session) throws Exception {
 			this.session = session;
 			session.sendMessage(new TextMessage(HANDSHAKE));
 			this.helloLatch.countDown();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java

@@ -65,37 +65,32 @@ public class ClassPathChangeUploaderTests {
 	@Before
 	public void setup() {
 		this.requestFactory = new MockClientHttpRequestFactory();
-		this.uploader = new ClassPathChangeUploader("http://localhost/upload",
-				this.requestFactory);
+		this.uploader = new ClassPathChangeUploader("http://localhost/upload", this.requestFactory);
 	}
 
 	@Test
 	public void urlMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathChangeUploader(null, this.requestFactory))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassPathChangeUploader(null, this.requestFactory))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void urlMustNotBeEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathChangeUploader("", this.requestFactory))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassPathChangeUploader("", this.requestFactory))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void requestFactoryMustNotBeNull() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(
-						() -> new ClassPathChangeUploader("http://localhost:8080", null))
+				.isThrownBy(() -> new ClassPathChangeUploader("http://localhost:8080", null))
 				.withMessageContaining("RequestFactory must not be null");
 	}
 
 	@Test
 	public void urlMustNotBeMalformed() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassPathChangeUploader("htttttp:///ttest",
-						this.requestFactory))
+				.isThrownBy(() -> new ClassPathChangeUploader("htttttp:///ttest", this.requestFactory))
 				.withMessageContaining("Malformed URL 'htttttp:///ttest'");
 	}
 
@@ -118,8 +113,7 @@ public class ClassPathChangeUploaderTests {
 		this.requestFactory.willRespond(HttpStatus.OK);
 		this.uploader.onApplicationEvent(event);
 		assertThat(this.requestFactory.getExecutedRequests()).hasSize(2);
-		verifyUploadRequest(sourceFolder,
-				this.requestFactory.getExecutedRequests().get(1));
+		verifyUploadRequest(sourceFolder, this.requestFactory.getExecutedRequests().get(1));
 	}
 
 	private void verifyUploadRequest(File sourceFolder, MockClientHttpRequest request)
@@ -137,13 +131,11 @@ public class ClassPathChangeUploaderTests {
 	}
 
 	private void assertClassFile(ClassLoaderFile file, String content, Kind kind) {
-		assertThat(file.getContents())
-				.isEqualTo((content != null) ? content.getBytes() : null);
+		assertThat(file.getContents()).isEqualTo((content != null) ? content.getBytes() : null);
 		assertThat(file.getKind()).isEqualTo(kind);
 	}
 
-	private ClassPathChangedEvent createClassPathChangedEvent(File sourceFolder)
-			throws IOException {
+	private ClassPathChangedEvent createClassPathChangedEvent(File sourceFolder) throws IOException {
 		Set<ChangedFile> files = new LinkedHashSet<>();
 		File file1 = createFile(sourceFolder, "File1");
 		File file2 = createFile(sourceFolder, "File2");
@@ -163,10 +155,8 @@ public class ClassPathChangeUploaderTests {
 		return file;
 	}
 
-	private ClassLoaderFiles deserialize(byte[] bytes)
-			throws IOException, ClassNotFoundException {
-		ObjectInputStream objectInputStream = new ObjectInputStream(
-				new ByteArrayInputStream(bytes));
+	private ClassLoaderFiles deserialize(byte[] bytes) throws IOException, ClassNotFoundException {
+		ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes));
 		return (ClassLoaderFiles) objectInputStream.readObject();
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTriggerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,47 +71,42 @@ public class DelayedLiveReloadTriggerTests {
 		MockitoAnnotations.initMocks(this);
 		given(this.errorRequest.execute()).willReturn(this.errorResponse);
 		given(this.okRequest.execute()).willReturn(this.okResponse);
-		given(this.errorResponse.getStatusCode())
-				.willReturn(HttpStatus.INTERNAL_SERVER_ERROR);
+		given(this.errorResponse.getStatusCode()).willReturn(HttpStatus.INTERNAL_SERVER_ERROR);
 		given(this.okResponse.getStatusCode()).willReturn(HttpStatus.OK);
-		this.trigger = new DelayedLiveReloadTrigger(this.liveReloadServer,
-				this.requestFactory, URL);
+		this.trigger = new DelayedLiveReloadTrigger(this.liveReloadServer, this.requestFactory, URL);
 	}
 
 	@Test
 	public void liveReloadServerMustNotBeNull() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new DelayedLiveReloadTrigger(null, this.requestFactory, URL))
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new DelayedLiveReloadTrigger(null, this.requestFactory, URL))
 				.withMessageContaining("LiveReloadServer must not be null");
 	}
 
 	@Test
 	public void requestFactoryMustNotBeNull() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new DelayedLiveReloadTrigger(this.liveReloadServer, null, URL))
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new DelayedLiveReloadTrigger(this.liveReloadServer, null, URL))
 				.withMessageContaining("RequestFactory must not be null");
 	}
 
 	@Test
 	public void urlMustNotBeNull() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new DelayedLiveReloadTrigger(this.liveReloadServer,
-						this.requestFactory, null))
+				.isThrownBy(() -> new DelayedLiveReloadTrigger(this.liveReloadServer, this.requestFactory, null))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void urlMustNotBeEmpty() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new DelayedLiveReloadTrigger(this.liveReloadServer,
-						this.requestFactory, ""))
+				.isThrownBy(() -> new DelayedLiveReloadTrigger(this.liveReloadServer, this.requestFactory, ""))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void triggerReloadOnStatus() throws Exception {
-		given(this.requestFactory.createRequest(new URI(URL), HttpMethod.GET))
-				.willThrow(new IOException())
+		given(this.requestFactory.createRequest(new URI(URL), HttpMethod.GET)).willThrow(new IOException())
 				.willReturn(this.errorRequest, this.okRequest);
 		long startTime = System.currentTimeMillis();
 		this.trigger.setTimings(10, 200, 30000);
@@ -122,8 +117,7 @@ public class DelayedLiveReloadTriggerTests {
 
 	@Test
 	public void timeout() throws Exception {
-		given(this.requestFactory.createRequest(new URI(URL), HttpMethod.GET))
-				.willThrow(new IOException());
+		given(this.requestFactory.createRequest(new URI(URL), HttpMethod.GET)).willThrow(new IOException());
 		this.trigger.setTimings(10, 0, 10);
 		this.trigger.run();
 		verify(this.liveReloadServer, never()).triggerReload();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,36 +73,31 @@ public class HttpHeaderInterceptorTests {
 
 	@Test
 	public void constructorNullHeaderName() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderInterceptor(null, this.value))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderInterceptor(null, this.value))
 				.withMessageContaining("Name must not be empty");
 	}
 
 	@Test
 	public void constructorEmptyHeaderName() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderInterceptor("", this.value))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderInterceptor("", this.value))
 				.withMessageContaining("Name must not be empty");
 	}
 
 	@Test
 	public void constructorNullHeaderValue() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderInterceptor(this.name, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderInterceptor(this.name, null))
 				.withMessageContaining("Value must not be empty");
 	}
 
 	@Test
 	public void constructorEmptyHeaderValue() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderInterceptor(this.name, ""))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderInterceptor(this.name, ""))
 				.withMessageContaining("Value must not be empty");
 	}
 
 	@Test
 	public void intercept() throws IOException {
-		ClientHttpResponse result = this.interceptor.intercept(this.request, this.body,
-				this.execution);
+		ClientHttpResponse result = this.interceptor.intercept(this.request, this.body, this.execution);
 		assertThat(this.request.getHeaders().getFirst(this.name)).isEqualTo(this.value);
 		assertThat(result).isEqualTo(this.response);
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,8 +101,7 @@ public class RemoteClientConfigurationTests {
 
 	@Test
 	public void failIfNoSecret() {
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> configure("http://localhost", false))
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> configure("http://localhost", false))
 				.withMessageContaining("required to secure your connection");
 	}
 
@@ -112,8 +111,7 @@ public class RemoteClientConfigurationTests {
 		Set<ChangedFiles> changeSet = new HashSet<>();
 		ClassPathChangedEvent event = new ClassPathChangedEvent(this, changeSet, false);
 		this.clientContext.publishEvent(event);
-		LiveReloadConfiguration configuration = this.clientContext
-				.getBean(LiveReloadConfiguration.class);
+		LiveReloadConfiguration configuration = this.clientContext.getBean(LiveReloadConfiguration.class);
 		configuration.getExecutor().shutdown();
 		configuration.getExecutor().awaitTermination(2, TimeUnit.SECONDS);
 		LiveReloadServer server = this.clientContext.getBean(LiveReloadServer.class);
@@ -142,8 +140,7 @@ public class RemoteClientConfigurationTests {
 		this.context = new AnnotationConfigServletWebServerApplicationContext();
 		this.context.register(Config.class);
 		if (setSecret) {
-			TestPropertyValues.of("spring.devtools.remote.secret:secret")
-					.applyTo(this.context);
+			TestPropertyValues.of("spring.devtools.remote.secret:secret").applyTo(this.context);
 		}
 		this.context.refresh();
 		this.clientContext = new AnnotationConfigApplicationContext();
@@ -151,11 +148,9 @@ public class RemoteClientConfigurationTests {
 		new RestartScopeInitializer().initialize(this.clientContext);
 		this.clientContext.register(ClientConfig.class, RemoteClientConfiguration.class);
 		if (setSecret) {
-			TestPropertyValues.of("spring.devtools.remote.secret:secret")
-					.applyTo(this.clientContext);
+			TestPropertyValues.of("spring.devtools.remote.secret:secret").applyTo(this.clientContext);
 		}
-		String remoteUrlProperty = "remoteUrl:" + remoteUrl + ":"
-				+ this.context.getWebServer().getPort();
+		String remoteUrlProperty = "remoteUrl:" + remoteUrl + ":" + this.context.getWebServer().getPort();
 		TestPropertyValues.of(remoteUrlProperty).applyTo(this.clientContext);
 		this.clientContext.refresh();
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherFilterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,12 +98,10 @@ public class DispatcherFilterTests {
 	public void handledByDispatcher() throws Exception {
 		HttpServletRequest request = new MockHttpServletRequest("GET", "/hello");
 		HttpServletResponse response = new MockHttpServletResponse();
-		willReturn(true).given(this.dispatcher).handle(any(ServerHttpRequest.class),
-				any(ServerHttpResponse.class));
+		willReturn(true).given(this.dispatcher).handle(any(ServerHttpRequest.class), any(ServerHttpResponse.class));
 		this.filter.doFilter(request, response, this.chain);
 		verifyZeroInteractions(this.chain);
-		verify(this.dispatcher).handle(this.serverRequestCaptor.capture(),
-				this.serverResponseCaptor.capture());
+		verify(this.dispatcher).handle(this.serverRequestCaptor.capture(), this.serverResponseCaptor.capture());
 		ServerHttpRequest dispatcherRequest = this.serverRequestCaptor.getValue();
 		ServletServerHttpRequest actualRequest = (ServletServerHttpRequest) dispatcherRequest;
 		ServerHttpResponse dispatcherResponse = this.serverResponseCaptor.getValue();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,27 +73,23 @@ public class DispatcherTests {
 
 	@Test
 	public void accessManagerMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new Dispatcher(null, Collections.emptyList()))
+		assertThatIllegalArgumentException().isThrownBy(() -> new Dispatcher(null, Collections.emptyList()))
 				.withMessageContaining("AccessManager must not be null");
 	}
 
 	@Test
 	public void mappersMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new Dispatcher(this.accessManager, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new Dispatcher(this.accessManager, null))
 				.withMessageContaining("Mappers must not be null");
 	}
 
 	@Test
 	public void accessManagerVetoRequest() throws Exception {
-		given(this.accessManager.isAllowed(any(ServerHttpRequest.class)))
-				.willReturn(false);
+		given(this.accessManager.isAllowed(any(ServerHttpRequest.class))).willReturn(false);
 		HandlerMapper mapper = mock(HandlerMapper.class);
 		Handler handler = mock(Handler.class);
 		given(mapper.getHandler(any(ServerHttpRequest.class))).willReturn(handler);
-		Dispatcher dispatcher = new Dispatcher(this.accessManager,
-				Collections.singleton(mapper));
+		Dispatcher dispatcher = new Dispatcher(this.accessManager, Collections.singleton(mapper));
 		dispatcher.handle(this.serverRequest, this.serverResponse);
 		verifyZeroInteractions(handler);
 		assertThat(this.response.getStatus()).isEqualTo(403);
@@ -101,23 +97,19 @@ public class DispatcherTests {
 
 	@Test
 	public void accessManagerAllowRequest() throws Exception {
-		given(this.accessManager.isAllowed(any(ServerHttpRequest.class)))
-				.willReturn(true);
+		given(this.accessManager.isAllowed(any(ServerHttpRequest.class))).willReturn(true);
 		HandlerMapper mapper = mock(HandlerMapper.class);
 		Handler handler = mock(Handler.class);
 		given(mapper.getHandler(any(ServerHttpRequest.class))).willReturn(handler);
-		Dispatcher dispatcher = new Dispatcher(this.accessManager,
-				Collections.singleton(mapper));
+		Dispatcher dispatcher = new Dispatcher(this.accessManager, Collections.singleton(mapper));
 		dispatcher.handle(this.serverRequest, this.serverResponse);
 		verify(handler).handle(this.serverRequest, this.serverResponse);
 	}
 
 	@Test
 	public void ordersMappers() throws Exception {
-		HandlerMapper mapper1 = mock(HandlerMapper.class,
-				withSettings().extraInterfaces(Ordered.class));
-		HandlerMapper mapper2 = mock(HandlerMapper.class,
-				withSettings().extraInterfaces(Ordered.class));
+		HandlerMapper mapper1 = mock(HandlerMapper.class, withSettings().extraInterfaces(Ordered.class));
+		HandlerMapper mapper2 = mock(HandlerMapper.class, withSettings().extraInterfaces(Ordered.class));
 		given(((Ordered) mapper1).getOrder()).willReturn(1);
 		given(((Ordered) mapper2).getOrder()).willReturn(2);
 		List<HandlerMapper> mappers = Arrays.asList(mapper2, mapper1);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManagerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,29 +53,25 @@ public class HttpHeaderAccessManagerTests {
 
 	@Test
 	public void headerNameMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderAccessManager(null, SECRET))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderAccessManager(null, SECRET))
 				.withMessageContaining("HeaderName must not be empty");
 	}
 
 	@Test
 	public void headerNameMustNotBeEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderAccessManager("", SECRET))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderAccessManager("", SECRET))
 				.withMessageContaining("HeaderName must not be empty");
 	}
 
 	@Test
 	public void expectedSecretMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderAccessManager(HEADER, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderAccessManager(HEADER, null))
 				.withMessageContaining("ExpectedSecret must not be empty");
 	}
 
 	@Test
 	public void expectedSecretMustNotBeEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpHeaderAccessManager(HEADER, ""))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpHeaderAccessManager(HEADER, ""))
 				.withMessageContaining("ExpectedSecret must not be empty");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,22 +40,19 @@ public class UrlHandlerMapperTests {
 
 	@Test
 	public void requestUriMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new UrlHandlerMapper(null, this.handler))
+		assertThatIllegalArgumentException().isThrownBy(() -> new UrlHandlerMapper(null, this.handler))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void requestUriMustNotBeEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new UrlHandlerMapper("", this.handler))
+		assertThatIllegalArgumentException().isThrownBy(() -> new UrlHandlerMapper("", this.handler))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void requestUrlMustStartWithSlash() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new UrlHandlerMapper("tunnel", this.handler))
+		assertThatIllegalArgumentException().isThrownBy(() -> new UrlHandlerMapper("tunnel", this.handler))
 				.withMessageContaining("URL must start with '/'");
 	}
 
@@ -70,8 +67,7 @@ public class UrlHandlerMapperTests {
 	@Test
 	public void ignoresDifferentUrl() {
 		UrlHandlerMapper mapper = new UrlHandlerMapper("/tunnel", this.handler);
-		HttpServletRequest servletRequest = new MockHttpServletRequest("GET",
-				"/tunnel/other");
+		HttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/tunnel/other");
 		ServerHttpRequest request = new ServletServerHttpRequest(servletRequest);
 		assertThat(mapper.getHandler(request)).isNull();
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java

@@ -71,9 +71,8 @@ public class ChangeableUrlsTests {
 
 	@Test
 	public void skipsUrls() throws Exception {
-		ChangeableUrls urls = ChangeableUrls.fromUrls(makeUrl("spring-boot"),
-				makeUrl("spring-boot-autoconfigure"), makeUrl("spring-boot-actuator"),
-				makeUrl("spring-boot-starter"),
+		ChangeableUrls urls = ChangeableUrls.fromUrls(makeUrl("spring-boot"), makeUrl("spring-boot-autoconfigure"),
+				makeUrl("spring-boot-actuator"), makeUrl("spring-boot-starter"),
 				makeUrl("spring-boot-starter-some-thing"));
 		assertThat(urls).isEmpty();
 	}
@@ -82,19 +81,16 @@ public class ChangeableUrlsTests {
 	public void urlsFromJarClassPathAreConsidered() throws Exception {
 		File relative = this.temporaryFolder.newFolder();
 		URL absoluteUrl = this.temporaryFolder.newFolder().toURI().toURL();
-		File jarWithClassPath = makeJarFileWithUrlsInManifestClassPath(
-				"project-core/target/classes/", "project-web/target/classes/",
-				"does-not-exist/target/classes", relative.getName() + "/", absoluteUrl);
-		new File(jarWithClassPath.getParentFile(), "project-core/target/classes")
-				.mkdirs();
+		File jarWithClassPath = makeJarFileWithUrlsInManifestClassPath("project-core/target/classes/",
+				"project-web/target/classes/", "does-not-exist/target/classes", relative.getName() + "/", absoluteUrl);
+		new File(jarWithClassPath.getParentFile(), "project-core/target/classes").mkdirs();
 		new File(jarWithClassPath.getParentFile(), "project-web/target/classes").mkdirs();
-		ChangeableUrls urls = ChangeableUrls
-				.fromClassLoader(new URLClassLoader(new URL[] {
-						jarWithClassPath.toURI().toURL(), makeJarFileWithNoManifest() }));
+		ChangeableUrls urls = ChangeableUrls.fromClassLoader(
+				new URLClassLoader(new URL[] { jarWithClassPath.toURI().toURL(), makeJarFileWithNoManifest() }));
 		assertThat(urls.toList()).containsExactly(
 				new URL(jarWithClassPath.toURI().toURL(), "project-core/target/classes/"),
-				new URL(jarWithClassPath.toURI().toURL(), "project-web/target/classes/"),
-				relative.toURI().toURL(), absoluteUrl);
+				new URL(jarWithClassPath.toURI().toURL(), "project-web/target/classes/"), relative.toURI().toURL(),
+				absoluteUrl);
 	}
 
 	private URL makeUrl(String name) throws IOException {
@@ -109,8 +105,7 @@ public class ChangeableUrlsTests {
 	private File makeJarFileWithUrlsInManifestClassPath(Object... urls) throws Exception {
 		File classpathJar = this.temporaryFolder.newFile("classpath.jar");
 		Manifest manifest = new Manifest();
-		manifest.getMainAttributes().putValue(Attributes.Name.MANIFEST_VERSION.toString(),
-				"1.0");
+		manifest.getMainAttributes().putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
 		manifest.getMainAttributes().putValue(Attributes.Name.CLASS_PATH.toString(),
 				StringUtils.arrayToDelimitedString(urls, " "));
 		new JarOutputStream(new FileOutputStream(classpathJar), manifest).close();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,8 +64,7 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 	@Before
 	public void setup() {
 		this.files = new ClassLoaderFiles();
-		this.resolver = new ClassLoaderFilesResourcePatternResolver(
-				new GenericApplicationContext(), this.files);
+		this.resolver = new ClassLoaderFilesResourcePatternResolver(new GenericApplicationContext(), this.files);
 	}
 
 	@Test
@@ -81,8 +80,7 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 
 	@Test
 	public void getResourceWhenHasServletContextShouldReturnServletResource() {
-		GenericWebApplicationContext context = new GenericWebApplicationContext(
-				new MockServletContext());
+		GenericWebApplicationContext context = new GenericWebApplicationContext(new MockServletContext());
 		this.resolver = new ClassLoaderFilesResourcePatternResolver(context, this.files);
 		Resource resource = this.resolver.getResource("index.html");
 		assertThat(resource).isNotNull().isInstanceOf(ServletContextResource.class);
@@ -92,19 +90,16 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 	public void getResourceWhenDeletedShouldReturnDeletedResource() throws Exception {
 		File folder = this.temp.newFolder();
 		File file = createFile(folder, "name.class");
-		this.files.addFile(folder.getName(), "name.class",
-				new ClassLoaderFile(Kind.DELETED, null));
+		this.files.addFile(folder.getName(), "name.class", new ClassLoaderFile(Kind.DELETED, null));
 		Resource resource = this.resolver.getResource("file:" + file.getAbsolutePath());
-		assertThat(resource).isNotNull()
-				.isInstanceOf(DeletedClassLoaderFileResource.class);
+		assertThat(resource).isNotNull().isInstanceOf(DeletedClassLoaderFileResource.class);
 	}
 
 	@Test
 	public void getResourcesShouldReturnResources() throws Exception {
 		File folder = this.temp.newFolder();
 		createFile(folder, "name.class");
-		Resource[] resources = this.resolver
-				.getResources("file:" + folder.getAbsolutePath() + "/**");
+		Resource[] resources = this.resolver.getResources("file:" + folder.getAbsolutePath() + "/**");
 		assertThat(resources).isNotEmpty();
 	}
 
@@ -112,10 +107,8 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 	public void getResourcesWhenDeletedShouldFilterDeleted() throws Exception {
 		File folder = this.temp.newFolder();
 		createFile(folder, "name.class");
-		this.files.addFile(folder.getName(), "name.class",
-				new ClassLoaderFile(Kind.DELETED, null));
-		Resource[] resources = this.resolver
-				.getResources("file:" + folder.getAbsolutePath() + "/**");
+		this.files.addFile(folder.getName(), "name.class", new ClassLoaderFile(Kind.DELETED, null));
+		Resource[] resources = this.resolver.getResources("file:" + folder.getAbsolutePath() + "/**");
 		assertThat(resources).isEmpty();
 	}
 
@@ -143,8 +136,7 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 
 	@Test
 	public void customResourceLoaderIsUsedInWebApplication() {
-		GenericWebApplicationContext context = new GenericWebApplicationContext(
-				new MockServletContext());
+		GenericWebApplicationContext context = new GenericWebApplicationContext(new MockServletContext());
 		ResourceLoader resourceLoader = mock(ResourceLoader.class);
 		context.setResourceLoader(resourceLoader);
 		this.resolver = new ClassLoaderFilesResourcePatternResolver(context, this.files);
@@ -154,8 +146,7 @@ public class ClassLoaderFilesResourcePatternResolverTests {
 
 	@Test
 	public void customProtocolResolverIsUsedInWebApplication() {
-		GenericWebApplicationContext context = new GenericWebApplicationContext(
-				new MockServletContext());
+		GenericWebApplicationContext context = new GenericWebApplicationContext(new MockServletContext());
 		Resource resource = mock(Resource.class);
 		ProtocolResolver resolver = mockProtocolResolver("foo:some-file.txt", resource);
 		context.addProtocolResolver(resolver);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/DefaultRestartInitializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,8 +74,7 @@ public class DefaultRestartInitializerTests {
 	@Test
 	public void threadNotUsingAppClassLoader() {
 		DefaultRestartInitializer initializer = new DefaultRestartInitializer();
-		ClassLoader classLoader = new MockLauncherClassLoader(
-				getClass().getClassLoader());
+		ClassLoader classLoader = new MockLauncherClassLoader(getClass().getClassLoader());
 		Thread thread = new Thread();
 		thread.setName("main");
 		thread.setContextClassLoader(classLoader);
@@ -84,8 +83,7 @@ public class DefaultRestartInitializerTests {
 
 	@Test
 	public void urlsCanBeRetrieved() {
-		assertThat(new DefaultRestartInitializer().getUrls(Thread.currentThread()))
-				.isNotEmpty();
+		assertThat(new DefaultRestartInitializer().getUrls(Thread.currentThread())).isNotEmpty();
 	}
 
 	protected void testSkippedStacks(String s) {
@@ -93,8 +91,7 @@ public class DefaultRestartInitializerTests {
 		ClassLoader classLoader = new MockAppClassLoader(getClass().getClassLoader());
 		Thread thread = mock(Thread.class);
 		thread.setName("main");
-		StackTraceElement element = new StackTraceElement(s, "someMethod", "someFile",
-				123);
+		StackTraceElement element = new StackTraceElement(s, "someMethod", "someFile", 123);
 		given(thread.getStackTrace()).willReturn(new StackTraceElement[] { element });
 		given(thread.getContextClassLoader()).willReturn(classLoader);
 		assertThat(initializer.getInitialUrls(thread)).isEqualTo(null);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,21 +53,18 @@ public class MainMethodTests {
 	public void validMainMethod() throws Exception {
 		MainMethod method = new TestThread(Valid::main).test();
 		assertThat(method.getMethod()).isEqualTo(this.actualMain);
-		assertThat(method.getDeclaringClassName())
-				.isEqualTo(this.actualMain.getDeclaringClass().getName());
+		assertThat(method.getDeclaringClassName()).isEqualTo(this.actualMain.getDeclaringClass().getName());
 	}
 
 	@Test
 	public void missingArgsMainMethod() throws Exception {
-		assertThatIllegalStateException()
-				.isThrownBy(() -> new TestThread(MissingArgs::main).test())
+		assertThatIllegalStateException().isThrownBy(() -> new TestThread(MissingArgs::main).test())
 				.withMessageContaining("Unable to find main method");
 	}
 
 	@Test
 	public void nonStatic() throws Exception {
-		assertThatIllegalStateException()
-				.isThrownBy(() -> new TestThread(() -> new NonStaticMain().main()).test())
+		assertThatIllegalStateException().isThrownBy(() -> new TestThread(() -> new NonStaticMain().main()).test())
 				.withMessageContaining("Unable to find main method");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,17 +60,16 @@ public class MockRestarter implements TestRule {
 	private void setup() {
 		Restarter.setInstance(this.mock);
 		given(this.mock.getInitialUrls()).willReturn(new URL[] {});
-		given(this.mock.getOrAddAttribute(anyString(), any(ObjectFactory.class)))
-				.willAnswer((invocation) -> {
-					String name = invocation.getArgument(0);
-					ObjectFactory factory = invocation.getArgument(1);
-					Object attribute = MockRestarter.this.attributes.get(name);
-					if (attribute == null) {
-						attribute = factory.getObject();
-						MockRestarter.this.attributes.put(name, attribute);
-					}
-					return attribute;
-				});
+		given(this.mock.getOrAddAttribute(anyString(), any(ObjectFactory.class))).willAnswer((invocation) -> {
+			String name = invocation.getArgument(0);
+			ObjectFactory factory = invocation.getArgument(1);
+			Object attribute = MockRestarter.this.attributes.get(name);
+			if (attribute == null) {
+				attribute = factory.getObject();
+				MockRestarter.this.attributes.put(name, attribute);
+			}
+			return attribute;
+		});
 		given(this.mock.getThreadFactory()).willReturn(Thread::new);
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +50,7 @@ public class OnInitializedRestarterConditionTests {
 	@Test
 	public void noInstance() {
 		Restarter.clearInstance();
-		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
-				Config.class);
+		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 		assertThat(context.containsBean("bean")).isFalse();
 		context.close();
 	}
@@ -59,8 +58,7 @@ public class OnInitializedRestarterConditionTests {
 	@Test
 	public void noInitialization() {
 		Restarter.initialize(new String[0], false, RestartInitializer.NONE);
-		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
-				Config.class);
+		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 		assertThat(context.containsBean("bean")).isFalse();
 		context.close();
 	}
@@ -80,8 +78,7 @@ public class OnInitializedRestarterConditionTests {
 			RestartInitializer initializer = mock(RestartInitializer.class);
 			given(initializer.getInitialUrls(any(Thread.class))).willReturn(new URL[0]);
 			Restarter.initialize(new String[0], false, initializer);
-			ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
-					Config.class);
+			ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 			assertThat(context.containsBean("bean")).isTrue();
 			context.close();
 			synchronized (wait) {

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,7 @@ public class RestartApplicationListenerTests {
 
 	@Test
 	public void isHighestPriority() {
-		assertThat(new RestartApplicationListener().getOrder())
-				.isEqualTo(Ordered.HIGHEST_PRECEDENCE);
+		assertThat(new RestartApplicationListener().getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 	}
 
 	@Test
@@ -70,8 +69,7 @@ public class RestartApplicationListenerTests {
 		testInitialize(false);
 		assertThat(Restarter.getInstance()).hasFieldOrPropertyWithValue("args", ARGS);
 		assertThat(Restarter.getInstance().isFinished()).isTrue();
-		assertThat((List<?>) ReflectionTestUtils.getField(Restarter.getInstance(),
-				"rootContexts")).isNotEmpty();
+		assertThat((List<?>) ReflectionTestUtils.getField(Restarter.getInstance(), "rootContexts")).isNotEmpty();
 	}
 
 	@Test
@@ -79,8 +77,7 @@ public class RestartApplicationListenerTests {
 		testInitialize(true);
 		assertThat(Restarter.getInstance()).hasFieldOrPropertyWithValue("args", ARGS);
 		assertThat(Restarter.getInstance().isFinished()).isTrue();
-		assertThat((List<?>) ReflectionTestUtils.getField(Restarter.getInstance(),
-				"rootContexts")).isEmpty();
+		assertThat((List<?>) ReflectionTestUtils.getField(Restarter.getInstance(), "rootContexts")).isEmpty();
 	}
 
 	@Test
@@ -89,28 +86,23 @@ public class RestartApplicationListenerTests {
 		this.output.reset();
 		testInitialize(false);
 		assertThat(Restarter.getInstance()).hasFieldOrPropertyWithValue("enabled", false);
-		assertThat(this.output.toString())
-				.contains("Restart disabled due to System property");
+		assertThat(this.output.toString()).contains("Restart disabled due to System property");
 	}
 
 	private void testInitialize(boolean failed) {
 		Restarter.clearInstance();
 		RestartApplicationListener listener = new RestartApplicationListener();
 		SpringApplication application = new SpringApplication();
-		ConfigurableApplicationContext context = mock(
-				ConfigurableApplicationContext.class);
+		ConfigurableApplicationContext context = mock(ConfigurableApplicationContext.class);
 		listener.onApplicationEvent(new ApplicationStartingEvent(application, ARGS));
 		assertThat(Restarter.getInstance()).isNotEqualTo(nullValue());
 		assertThat(Restarter.getInstance().isFinished()).isFalse();
-		listener.onApplicationEvent(
-				new ApplicationPreparedEvent(application, ARGS, context));
+		listener.onApplicationEvent(new ApplicationPreparedEvent(application, ARGS, context));
 		if (failed) {
-			listener.onApplicationEvent(new ApplicationFailedEvent(application, ARGS,
-					context, new RuntimeException()));
+			listener.onApplicationEvent(new ApplicationFailedEvent(application, ARGS, context, new RuntimeException()));
 		}
 		else {
-			listener.onApplicationEvent(
-					new ApplicationReadyEvent(application, ARGS, context));
+			listener.onApplicationEvent(new ApplicationReadyEvent(application, ARGS, context));
 		}
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,7 @@ public class RestartScopeInitializerTests {
 
 	}
 
-	public static class ScopeTestBean
-			implements ApplicationListener<ContextRefreshedEvent> {
+	public static class ScopeTestBean implements ApplicationListener<ContextRefreshedEvent> {
 
 		public ScopeTestBean() {
 			createCount.incrementAndGet();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,8 +100,7 @@ public class RestarterTests {
 
 	@Test
 	public void addUrlsMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> Restarter.getInstance().addUrls(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> Restarter.getInstance().addUrls(null))
 				.withMessageContaining("Urls must not be null");
 	}
 
@@ -112,15 +111,13 @@ public class RestarterTests {
 		Restarter restarter = Restarter.getInstance();
 		restarter.addUrls(urls);
 		restarter.restart();
-		ClassLoader classLoader = ((TestableRestarter) restarter)
-				.getRelaunchClassLoader();
+		ClassLoader classLoader = ((TestableRestarter) restarter).getRelaunchClassLoader();
 		assertThat(((URLClassLoader) classLoader).getURLs()[0]).isEqualTo(url);
 	}
 
 	@Test
 	public void addClassLoaderFilesMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> Restarter.getInstance().addClassLoaderFiles(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> Restarter.getInstance().addClassLoaderFiles(null))
 				.withMessageContaining("ClassLoaderFiles must not be null");
 	}
 
@@ -131,10 +128,8 @@ public class RestarterTests {
 		Restarter restarter = Restarter.getInstance();
 		restarter.addClassLoaderFiles(classLoaderFiles);
 		restarter.restart();
-		ClassLoader classLoader = ((TestableRestarter) restarter)
-				.getRelaunchClassLoader();
-		assertThat(FileCopyUtils.copyToByteArray(classLoader.getResourceAsStream("f")))
-				.isEqualTo("abc".getBytes());
+		ClassLoader classLoader = ((TestableRestarter) restarter).getRelaunchClassLoader();
+		assertThat(FileCopyUtils.copyToByteArray(classLoader.getResourceAsStream("f"))).isEqualTo("abc".getBytes());
 	}
 
 	@Test
@@ -219,8 +214,7 @@ public class RestarterTests {
 
 	}
 
-	private static class CloseCountingApplicationListener
-			implements ApplicationListener<ContextClosedEvent> {
+	private static class CloseCountingApplicationListener implements ApplicationListener<ContextClosedEvent> {
 
 		static int closed = 0;
 
@@ -236,12 +230,11 @@ public class RestarterTests {
 		private ClassLoader relaunchClassLoader;
 
 		TestableRestarter() {
-			this(Thread.currentThread(), new String[] {}, false,
-					new MockRestartInitializer());
+			this(Thread.currentThread(), new String[] {}, false, new MockRestartInitializer());
 		}
 
-		protected TestableRestarter(Thread thread, String[] args,
-				boolean forceReferenceCleanup, RestartInitializer initializer) {
+		protected TestableRestarter(Thread thread, String[] args, boolean forceReferenceCleanup,
+				RestartInitializer initializer) {
 			super(thread, args, forceReferenceCleanup, initializer);
 		}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,8 +81,7 @@ public class SilentExitExceptionHandlerTests {
 		private Throwable thrown;
 
 		TestThread() {
-			setUncaughtExceptionHandler(
-					(thread, exception) -> TestThread.this.thrown = exception);
+			setUncaughtExceptionHandler((thread, exception) -> TestThread.this.thrown = exception);
 		}
 
 		public Throwable getThrown() {
@@ -96,8 +95,7 @@ public class SilentExitExceptionHandlerTests {
 
 	}
 
-	private static class TestSilentExitExceptionHandler
-			extends SilentExitExceptionHandler {
+	private static class TestSilentExitExceptionHandler extends SilentExitExceptionHandler {
 
 		private boolean nonZeroExitCodePrevented;
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,29 +34,25 @@ public class ClassLoaderFileTests {
 
 	@Test
 	public void kindMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassLoaderFile(null, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassLoaderFile(null, null))
 				.withMessageContaining("Kind must not be null");
 	}
 
 	@Test
 	public void addedContentsMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassLoaderFile(Kind.ADDED, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassLoaderFile(Kind.ADDED, null))
 				.withMessageContaining("Contents must not be null");
 	}
 
 	@Test
 	public void modifiedContentsMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassLoaderFile(Kind.MODIFIED, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassLoaderFile(Kind.MODIFIED, null))
 				.withMessageContaining("Contents must not be null");
 	}
 
 	@Test
 	public void deletedContentsMustBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ClassLoaderFile(Kind.DELETED, new byte[10]))
+		assertThatIllegalArgumentException().isThrownBy(() -> new ClassLoaderFile(Kind.DELETED, new byte[10]))
 				.withMessageContaining("Contents must be null");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFilesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,15 +42,13 @@ public class ClassLoaderFilesTests {
 
 	@Test
 	public void addFileNameMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.files.addFile(null, mock(ClassLoaderFile.class)))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.files.addFile(null, mock(ClassLoaderFile.class)))
 				.withMessageContaining("Name must not be null");
 	}
 
 	@Test
 	public void addFileFileMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.files.addFile("test", null))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.files.addFile("test", null))
 				.withMessageContaining("File must not be null");
 	}
 
@@ -87,10 +85,8 @@ public class ClassLoaderFilesTests {
 		this.files.addFile("a", "myfile", file1);
 		this.files.addFile("b", "myfile", file2);
 		assertThat(this.files.getFile("myfile")).isEqualTo(file2);
-		assertThat(this.files.getOrCreateSourceFolder("a").getFiles().size())
-				.isEqualTo(0);
-		assertThat(this.files.getOrCreateSourceFolder("b").getFiles().size())
-				.isEqualTo(1);
+		assertThat(this.files.getOrCreateSourceFolder("a").getFiles().size()).isEqualTo(0);
+		assertThat(this.files.getOrCreateSourceFolder("b").getFiles().size()).isEqualTo(1);
 	}
 
 	@Test
@@ -121,8 +117,7 @@ public class ClassLoaderFilesTests {
 		ObjectOutputStream oos = new ObjectOutputStream(bos);
 		oos.writeObject(this.files);
 		oos.close();
-		ObjectInputStream ois = new ObjectInputStream(
-				new ByteArrayInputStream(bos.toByteArray()));
+		ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
 		ClassLoaderFiles readObject = (ClassLoaderFiles) ois.readObject();
 		assertThat(readObject.getFile("myfile")).isNotNull();
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 @SuppressWarnings("resource")
 public class RestartClassLoaderTests {
 
-	private static final String PACKAGE = RestartClassLoaderTests.class.getPackage()
-			.getName();
+	private static final String PACKAGE = RestartClassLoaderTests.class.getPackage().getName();
 
 	private static final String PACKAGE_PATH = PACKAGE.replace('.', '/');
 
@@ -74,8 +73,7 @@ public class RestartClassLoaderTests {
 		URL[] urls = new URL[] { url };
 		this.parentClassLoader = new URLClassLoader(urls, classLoader);
 		this.updatedFiles = new ClassLoaderFiles();
-		this.reloadClassLoader = new RestartClassLoader(this.parentClassLoader, urls,
-				this.updatedFiles);
+		this.reloadClassLoader = new RestartClassLoader(this.parentClassLoader, urls, this.updatedFiles);
 	}
 
 	private File createSampleJarFile() throws IOException {
@@ -93,36 +91,32 @@ public class RestartClassLoaderTests {
 
 	@Test
 	public void parentMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new RestartClassLoader(null, new URL[] {}))
+		assertThatIllegalArgumentException().isThrownBy(() -> new RestartClassLoader(null, new URL[] {}))
 				.withMessageContaining("Parent must not be null");
 	}
 
 	@Test
 	public void updatedFilesMustNotBeNull() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new RestartClassLoader(this.parentClassLoader, new URL[] {}, null))
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new RestartClassLoader(this.parentClassLoader, new URL[] {}, null))
 				.withMessageContaining("UpdatedFiles must not be null");
 	}
 
 	@Test
 	public void getResourceFromReloadableUrl() throws Exception {
-		String content = readString(
-				this.reloadClassLoader.getResourceAsStream(PACKAGE_PATH + "/Sample.txt"));
+		String content = readString(this.reloadClassLoader.getResourceAsStream(PACKAGE_PATH + "/Sample.txt"));
 		assertThat(content).startsWith("fromchild");
 	}
 
 	@Test
 	public void getResourceFromParent() throws Exception {
-		String content = readString(
-				this.reloadClassLoader.getResourceAsStream(PACKAGE_PATH + "/Parent.txt"));
+		String content = readString(this.reloadClassLoader.getResourceAsStream(PACKAGE_PATH + "/Parent.txt"));
 		assertThat(content).startsWith("fromparent");
 	}
 
 	@Test
 	public void getResourcesFiltersDuplicates() throws Exception {
-		List<URL> resources = toList(
-				this.reloadClassLoader.getResources(PACKAGE_PATH + "/Sample.txt"));
+		List<URL> resources = toList(this.reloadClassLoader.getResources(PACKAGE_PATH + "/Sample.txt"));
 		assertThat(resources.size()).isEqualTo(1);
 	}
 
@@ -175,8 +169,7 @@ public class RestartClassLoaderTests {
 		byte[] bytes = "abc".getBytes();
 		this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.MODIFIED, bytes));
 		List<URL> resources = toList(this.reloadClassLoader.getResources(name));
-		assertThat(FileCopyUtils.copyToByteArray(resources.get(0).openStream()))
-				.isEqualTo(bytes);
+		assertThat(FileCopyUtils.copyToByteArray(resources.get(0).openStream())).isEqualTo(bytes);
 	}
 
 	@Test
@@ -198,8 +191,7 @@ public class RestartClassLoaderTests {
 	@Test
 	public void getAddedClass() throws Exception {
 		String name = PACKAGE_PATH + "/SampleParent.class";
-		byte[] bytes = FileCopyUtils
-				.copyToByteArray(getClass().getResourceAsStream("SampleParent.class"));
+		byte[] bytes = FileCopyUtils.copyToByteArray(getClass().getResourceAsStream("SampleParent.class"));
 		this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.ADDED, bytes));
 		Class<?> loaded = this.reloadClassLoader.loadClass(PACKAGE + ".SampleParent");
 		assertThat(loaded.getClassLoader()).isEqualTo(this.reloadClassLoader);
@@ -210,8 +202,7 @@ public class RestartClassLoaderTests {
 	}
 
 	private <T> List<T> toList(Enumeration<T> enumeration) {
-		return (enumeration != null) ? Collections.list(enumeration)
-				: Collections.emptyList();
+		return (enumeration != null) ? Collections.list(enumeration) : Collections.emptyList();
 	}
 
 }

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,17 +71,13 @@ public class DefaultSourceFolderUrlFilterTests {
 
 	@Test
 	public void skippedProjects() throws Exception {
-		String sourceFolder = "/Users/me/code/spring-boot-samples/"
-				+ "spring-boot-sample-devtools";
-		URL jarUrl = new URL("jar:file:/Users/me/tmp/"
-				+ "spring-boot-sample-devtools-1.3.0.BUILD-SNAPSHOT.jar!/");
+		String sourceFolder = "/Users/me/code/spring-boot-samples/" + "spring-boot-sample-devtools";
+		URL jarUrl = new URL("jar:file:/Users/me/tmp/" + "spring-boot-sample-devtools-1.3.0.BUILD-SNAPSHOT.jar!/");
 		assertThat(this.filter.isMatch(sourceFolder, jarUrl)).isTrue();
-		URL nestedJarUrl = new URL("jar:file:/Users/me/tmp/"
-				+ "spring-boot-sample-devtools-1.3.0.BUILD-SNAPSHOT.jar!/"
+		URL nestedJarUrl = new URL("jar:file:/Users/me/tmp/" + "spring-boot-sample-devtools-1.3.0.BUILD-SNAPSHOT.jar!/"
 				+ "lib/spring-boot-1.3.0.BUILD-SNAPSHOT.jar!/");
 		assertThat(this.filter.isMatch(sourceFolder, nestedJarUrl)).isFalse();
-		URL fileUrl = new URL("file:/Users/me/tmp/"
-				+ "spring-boot-sample-devtools-1.3.0.BUILD-SNAPSHOT.jar");
+		URL fileUrl = new URL("file:/Users/me/tmp/" + "spring-boot-sample-devtools-1.3.0.BUILD-SNAPSHOT.jar");
 		assertThat(this.filter.isMatch(sourceFolder, fileUrl)).isTrue();
 	}
 
@@ -92,14 +88,12 @@ public class DefaultSourceFolderUrlFilterTests {
 		doTest(sourcePostfix, "my-module.other", false);
 	}
 
-	private void doTest(String sourcePostfix, String moduleRoot, boolean expected)
-			throws MalformedURLException {
+	private void doTest(String sourcePostfix, String moduleRoot, boolean expected) throws MalformedURLException {
 		String sourceFolder = SOURCE_ROOT + sourcePostfix;
 		for (String postfix : COMMON_POSTFIXES) {
 			for (URL url : getUrls(moduleRoot + postfix)) {
 				boolean match = this.filter.isMatch(sourceFolder, url);
-				assertThat(match).as(url + " against " + sourceFolder)
-						.isEqualTo(expected);
+				assertThat(match).as(url + " against " + sourceFolder).isEqualTo(expected);
 			}
 		}
 	}
@@ -109,10 +103,8 @@ public class DefaultSourceFolderUrlFilterTests {
 		urls.add(new URL("file:/some/path/" + name));
 		urls.add(new URL("file:/some/path/" + name + "!/"));
 		for (String postfix : COMMON_POSTFIXES) {
-			urls.add(new URL(
-					"jar:file:/some/path/lib-module" + postfix + "!/lib/" + name));
-			urls.add(new URL(
-					"jar:file:/some/path/lib-module" + postfix + "!/lib/" + name + "!/"));
+			urls.add(new URL("jar:file:/some/path/lib-module" + postfix + "!/lib/" + name));
+			urls.add(new URL("jar:file:/some/path/lib-module" + postfix + "!/lib/" + name + "!/"));
 		}
 		return urls;
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,7 @@ public class HttpRestartServerHandlerTests {
 
 	@Test
 	public void serverMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpRestartServerHandler(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpRestartServerHandler(null))
 				.withMessageContaining("Server must not be null");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,15 +63,13 @@ public class HttpRestartServerTests {
 
 	@Test
 	public void sourceFolderUrlFilterMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpRestartServer((SourceFolderUrlFilter) null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpRestartServer((SourceFolderUrlFilter) null))
 				.withMessageContaining("SourceFolderUrlFilter must not be null");
 	}
 
 	@Test
 	public void restartServerMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpRestartServer((RestartServer) null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpRestartServer((RestartServer) null))
 				.withMessageContaining("RestartServer must not be null");
 	}
 
@@ -83,8 +81,7 @@ public class HttpRestartServerTests {
 		files.addFile("name", new ClassLoaderFile(Kind.ADDED, new byte[0]));
 		byte[] bytes = serialize(files);
 		request.setContent(bytes);
-		this.server.handle(new ServletServerHttpRequest(request),
-				new ServletServerHttpResponse(response));
+		this.server.handle(new ServletServerHttpRequest(request), new ServletServerHttpResponse(response));
 		verify(this.delegate).updateAndRestart(this.filesCaptor.capture());
 		assertThat(this.filesCaptor.getValue().getFile("name")).isNotNull();
 		assertThat(response.getStatus()).isEqualTo(200);
@@ -94,8 +91,7 @@ public class HttpRestartServerTests {
 	public void sendNoContent() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
-		this.server.handle(new ServletServerHttpRequest(request),
-				new ServletServerHttpResponse(response));
+		this.server.handle(new ServletServerHttpRequest(request), new ServletServerHttpResponse(response));
 		verifyZeroInteractions(this.delegate);
 		assertThat(response.getStatus()).isEqualTo(500);
 
@@ -106,8 +102,7 @@ public class HttpRestartServerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		request.setContent(new byte[] { 0, 0, 0 });
-		this.server.handle(new ServletServerHttpRequest(request),
-				new ServletServerHttpResponse(response));
+		this.server.handle(new ServletServerHttpRequest(request), new ServletServerHttpResponse(response));
 		verifyZeroInteractions(this.delegate);
 		assertThat(response.getStatus()).isEqualTo(500);
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,7 @@ public class RestartServerTests {
 
 	@Test
 	public void sourceFolderUrlFilterMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new RestartServer((SourceFolderUrlFilter) null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new RestartServer((SourceFolderUrlFilter) null))
 				.withMessageContaining("SourceFolderUrlFilter must not be null");
 	}
 
@@ -60,8 +59,7 @@ public class RestartServerTests {
 		URL url3 = new URL("file:/proj/module-c.jar!/");
 		URL url4 = new URL("file:/proj/module-d.jar!/");
 		URLClassLoader classLoaderA = new URLClassLoader(new URL[] { url1, url2 });
-		URLClassLoader classLoaderB = new URLClassLoader(new URL[] { url3, url4 },
-				classLoaderA);
+		URLClassLoader classLoaderB = new URLClassLoader(new URL[] { url3, url4 }, classLoaderA);
 		SourceFolderUrlFilter filter = new DefaultSourceFolderUrlFilter();
 		MockRestartServer server = new MockRestartServer(filter, classLoaderB);
 		ClassLoaderFiles files = new ClassLoaderFiles();
@@ -114,8 +112,7 @@ public class RestartServerTests {
 
 	private static class MockRestartServer extends RestartServer {
 
-		MockRestartServer(SourceFolderUrlFilter sourceFolderUrlFilter,
-				ClassLoader classLoader) {
+		MockRestartServer(SourceFolderUrlFilter sourceFolderUrlFilter, ClassLoader classLoader) {
 			super(sourceFolderUrlFilter, classLoader);
 		}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/settings/DevToolsSettingsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,13 +36,11 @@ public class DevToolsSettingsTests {
 	@Rule
 	public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-	private static final String ROOT = DevToolsSettingsTests.class.getPackage().getName()
-			.replace('.', '/') + "/";
+	private static final String ROOT = DevToolsSettingsTests.class.getPackage().getName().replace('.', '/') + "/";
 
 	@Test
 	public void includePatterns() throws Exception {
-		DevToolsSettings settings = DevToolsSettings
-				.load(ROOT + "spring-devtools-include.properties");
+		DevToolsSettings settings = DevToolsSettings.load(ROOT + "spring-devtools-include.properties");
 		assertThat(settings.isRestartInclude(new URL("file://test/a"))).isTrue();
 		assertThat(settings.isRestartInclude(new URL("file://test/b"))).isTrue();
 		assertThat(settings.isRestartInclude(new URL("file://test/c"))).isFalse();
@@ -50,8 +48,7 @@ public class DevToolsSettingsTests {
 
 	@Test
 	public void excludePatterns() throws Exception {
-		DevToolsSettings settings = DevToolsSettings
-				.load(ROOT + "spring-devtools-exclude.properties");
+		DevToolsSettings settings = DevToolsSettings.load(ROOT + "spring-devtools-exclude.properties");
 		assertThat(settings.isRestartExclude(new URL("file://test/a"))).isTrue();
 		assertThat(settings.isRestartExclude(new URL("file://test/b"))).isTrue();
 		assertThat(settings.isRestartExclude(new URL("file://test/c"))).isFalse();
@@ -61,12 +58,10 @@ public class DevToolsSettingsTests {
 	public void defaultIncludePatterns() throws Exception {
 		DevToolsSettings settings = DevToolsSettings.get();
 		assertThat(settings.isRestartExclude(makeUrl("spring-boot"))).isTrue();
-		assertThat(settings.isRestartExclude(makeUrl("spring-boot-autoconfigure")))
-				.isTrue();
+		assertThat(settings.isRestartExclude(makeUrl("spring-boot-autoconfigure"))).isTrue();
 		assertThat(settings.isRestartExclude(makeUrl("spring-boot-actuator"))).isTrue();
 		assertThat(settings.isRestartExclude(makeUrl("spring-boot-starter"))).isTrue();
-		assertThat(settings.isRestartExclude(makeUrl("spring-boot-starter-some-thing")))
-				.isTrue();
+		assertThat(settings.isRestartExclude(makeUrl("spring-boot-starter-some-thing"))).isTrue();
 	}
 
 	private URL makeUrl(String name) throws IOException {

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +50,7 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 	private List<MockClientHttpRequest> executedRequests = new ArrayList<>();
 
 	@Override
-	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod)
-			throws IOException {
+	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		return new MockRequest(uri, httpMethod);
 	}
 
@@ -97,8 +96,7 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 			if (response == null) {
 				response = new Response(0, null, HttpStatus.GONE);
 			}
-			return ((Response) response)
-					.asHttpResponse(MockClientHttpRequestFactory.this.seq);
+			return ((Response) response).asHttpResponse(MockClientHttpRequestFactory.this.seq);
 		}
 
 	}
@@ -123,10 +121,8 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 			waitForDelay();
 			if (this.payload != null) {
 				httpResponse.getHeaders().setContentLength(this.payload.length);
-				httpResponse.getHeaders()
-						.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-				httpResponse.getHeaders().add("x-seq",
-						Long.toString(seq.incrementAndGet()));
+				httpResponse.getHeaders().setContentType(MediaType.APPLICATION_OCTET_STREAM);
+				httpResponse.getHeaders().add("x-seq", Long.toString(seq.incrementAndGet()));
 			}
 			return httpResponse;
 		}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnectionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,29 +76,26 @@ public class HttpTunnelConnectionTests {
 
 	@Test
 	public void urlMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelConnection(null, this.requestFactory))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelConnection(null, this.requestFactory))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void urlMustNotBeEmpty() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelConnection("", this.requestFactory))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelConnection("", this.requestFactory))
 				.withMessageContaining("URL must not be empty");
 	}
 
 	@Test
 	public void urlMustNotBeMalformed() {
-		assertThatIllegalArgumentException().isThrownBy(
-				() -> new HttpTunnelConnection("htttttp:///ttest", this.requestFactory))
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> new HttpTunnelConnection("htttttp:///ttest", this.requestFactory))
 				.withMessageContaining("Malformed URL 'htttttp:///ttest'");
 	}
 
 	@Test
 	public void requestFactoryMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelConnection(this.url, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelConnection(this.url, null))
 				.withMessageContaining("RequestFactory must not be null");
 	}
 
@@ -148,8 +145,7 @@ public class HttpTunnelConnectionTests {
 		this.requestFactory.willRespond(new ConnectException());
 		TunnelChannel tunnel = openTunnel(true);
 		assertThat(tunnel.isOpen()).isFalse();
-		this.outputCapture.expect(containsString(
-				"Failed to connect to remote application at http://localhost:12345"));
+		this.outputCapture.expect(containsString("Failed to connect to remote application at http://localhost:12345"));
 	}
 
 	private void write(TunnelChannel channel, String string) throws IOException {
@@ -157,8 +153,8 @@ public class HttpTunnelConnectionTests {
 	}
 
 	private TunnelChannel openTunnel(boolean singleThreaded) throws Exception {
-		HttpTunnelConnection connection = new HttpTunnelConnection(this.url,
-				this.requestFactory, singleThreaded ? new CurrentThreadExecutor() : null);
+		HttpTunnelConnection connection = new HttpTunnelConnection(this.url, this.requestFactory,
+				singleThreaded ? new CurrentThreadExecutor() : null);
 		return connection.open(this.incomingChannel, this.closeable);
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,8 +44,7 @@ public class TunnelClientTests {
 
 	@Test
 	public void listenPortMustNotBeNegative() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new TunnelClient(-5, this.tunnelConnection))
+		assertThatIllegalArgumentException().isThrownBy(() -> new TunnelClient(-5, this.tunnelConnection))
 				.withMessageContaining("ListenPort must be greater than or equal to 0");
 	}
 
@@ -117,8 +116,7 @@ public class TunnelClientTests {
 		private int openedTimes;
 
 		@Override
-		public WritableByteChannel open(WritableByteChannel incomingChannel,
-				Closeable closeable) {
+		public WritableByteChannel open(WritableByteChannel incomingChannel, Closeable closeable) {
 			this.openedTimes++;
 			this.open = true;
 			return new TunnelChannel(incomingChannel, closeable);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@ public class HttpTunnelPayloadForwarderTests {
 
 	@Test
 	public void targetChannelMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelPayloadForwarder(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelPayloadForwarder(null))
 				.withMessageContaining("TargetChannel must not be null");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,15 +50,13 @@ public class HttpTunnelPayloadTests {
 
 	@Test
 	public void sequenceMustBePositive() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelPayload(0, ByteBuffer.allocate(1)))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelPayload(0, ByteBuffer.allocate(1)))
 				.withMessageContaining("Sequence must be positive");
 	}
 
 	@Test
 	public void dataMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelPayload(1, null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelPayload(1, null))
 				.withMessageContaining("Data must not be null");
 	}
 
@@ -116,8 +114,7 @@ public class HttpTunnelPayloadTests {
 
 	@Test
 	public void getPayloadData() throws Exception {
-		ReadableByteChannel channel = Channels
-				.newChannel(new ByteArrayInputStream("hello".getBytes()));
+		ReadableByteChannel channel = Channels.newChannel(new ByteArrayInputStream("hello".getBytes()));
 		ByteBuffer payloadData = HttpTunnelPayload.getPayloadData(channel);
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		WritableByteChannel writeChannel = Channels.newChannel(out);
@@ -130,8 +127,7 @@ public class HttpTunnelPayloadTests {
 	@Test
 	public void getPayloadDataWithTimeout() throws Exception {
 		ReadableByteChannel channel = mock(ReadableByteChannel.class);
-		given(channel.read(any(ByteBuffer.class)))
-				.willThrow(new SocketTimeoutException());
+		given(channel.read(any(ByteBuffer.class))).willThrow(new SocketTimeoutException());
 		ByteBuffer payload = HttpTunnelPayload.getPayloadData(channel);
 		assertThat(payload).isNull();
 	}

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,7 @@ public class HttpTunnelServerHandlerTests {
 
 	@Test
 	public void serverMustNotBeNull() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new HttpTunnelServerHandler(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new HttpTunnelServerHandler(null))
 				.withMessageContaining("Server must not be null");
 	}
 

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,8 +119,7 @@ public class HttpTunnelServerTests {
 
 	@Test
 	public void longPollTimeoutMustBePositiveValue() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.server.setLongPollTimeout(0))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.server.setLongPollTimeout(0))
 				.withMessageContaining("LongPollTimeout must be a positive value");
 	}
 
@@ -252,8 +251,7 @@ public class HttpTunnelServerTests {
 
 	@Test
 	public void disconnectTimeoutMustBePositive() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.server.setDisconnectTimeout(0))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.server.setDisconnectTimeout(0))
 				.withMessageContaining("DisconnectTimeout must be a positive value");
 	}
 
@@ -294,11 +292,9 @@ public class HttpTunnelServerTests {
 		testHttpConnectionNonAsync(100);
 	}
 
-	private void testHttpConnectionNonAsync(long sleepBeforeResponse)
-			throws IOException, InterruptedException {
+	private void testHttpConnectionNonAsync(long sleepBeforeResponse) throws IOException, InterruptedException {
 		ServerHttpRequest request = mock(ServerHttpRequest.class);
-		given(request.getAsyncRequestControl(this.response))
-				.willThrow(new IllegalArgumentException());
+		given(request.getAsyncRequestControl(this.response)).willThrow(new IllegalArgumentException());
 		final HttpConnection connection = new HttpConnection(request, this.response);
 		final AtomicBoolean responded = new AtomicBoolean();
 		Thread connectionThread = new Thread(() -> {
@@ -366,8 +362,7 @@ public class HttpTunnelServerTests {
 		@Override
 		public int read(ByteBuffer dst) throws IOException {
 			try {
-				ByteBuffer bytes = this.outgoing.pollFirst(this.timeout,
-						TimeUnit.MILLISECONDS);
+				ByteBuffer bytes = this.outgoing.pollFirst(this.timeout, TimeUnit.MILLISECONDS);
 				if (bytes == null) {
 					throw new SocketTimeoutException();
 				}
@@ -437,17 +432,14 @@ public class HttpTunnelServerTests {
 		}
 
 		public MockHttpServletRequest getServletRequest() {
-			return (MockHttpServletRequest) ((ServletServerHttpRequest) getRequest())
-					.getServletRequest();
+			return (MockHttpServletRequest) ((ServletServerHttpRequest) getRequest()).getServletRequest();
 		}
 
 		public MockHttpServletResponse getServletResponse() {
-			return (MockHttpServletResponse) ((ServletServerHttpResponse) getResponse())
-					.getServletResponse();
+			return (MockHttpServletResponse) ((ServletServerHttpResponse) getResponse()).getServletResponse();
 		}
 
-		public void verifyReceived(String expectedContent, int expectedSeq)
-				throws Exception {
+		public void verifyReceived(String expectedContent, int expectedSeq) throws Exception {
 			waitForServletResponse();
 			MockHttpServletResponse resp = getServletResponse();
 			assertThat(resp.getContentAsString()).isEqualTo(expectedContent);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java

@@ -75,8 +75,7 @@ public class SocketTargetServerConnectionTests {
 		this.server.start();
 		ByteChannel channel = this.connection.open(10);
 		long startTime = System.currentTimeMillis();
-		assertThatExceptionOfType(SocketTimeoutException.class)
-				.isThrownBy(() -> channel.read(ByteBuffer.allocate(5)))
+		assertThatExceptionOfType(SocketTimeoutException.class).isThrownBy(() -> channel.read(ByteBuffer.allocate(5)))
 				.satisfies((ex) -> {
 					long runTime = System.currentTimeMillis() - startTime;
 					assertThat(runTime).isGreaterThanOrEqualTo(10L);
@@ -149,8 +148,7 @@ public class SocketTargetServerConnectionTests {
 						}
 					}
 					if (MockServer.this.expect != null) {
-						ByteBuffer buffer = ByteBuffer
-								.allocate(MockServer.this.expect.length);
+						ByteBuffer buffer = ByteBuffer.allocate(MockServer.this.expect.length);
 						while (buffer.hasRemaining()) {
 							channel.read(buffer);
 						}