From 0baceb4aa47babde6b2afa742f3cf76c83a59095 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 7 May 2019 20:57:25 +0900 Subject: [PATCH 1/2] Remove unnecessary latches in tests See gh-16733 --- .../AbstractDevToolsDataSourceAutoConfigurationTests.java | 3 --- .../autoconfigure/LocalDevToolsAutoConfigurationTests.java | 3 --- .../autoconfigure/RemoteDevToolsAutoConfigurationTests.java | 3 --- .../boot/devtools/env/DevToolPropertiesIntegrationTests.java | 3 --- .../devtools/env/DevToolsHomePropertiesPostProcessorTests.java | 3 --- 5 files changed, 15 deletions(-) diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java index 6fc1309b4ff..c7355edc204 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.Collection; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; @@ -95,11 +94,9 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests { protected ConfigurableApplicationContext getContext( Supplier supplier) throws Exception { - CountDownLatch latch = new CountDownLatch(1); AtomicReference atomicReference = new AtomicReference<>(); Thread thread = new Thread(() -> { ConfigurableApplicationContext context = supplier.get(); - latch.countDown(); atomicReference.getAndSet(context); }); thread.start(); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java index 5546f816f19..fd775f64d69 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java @@ -21,7 +21,6 @@ import java.time.Duration; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; @@ -253,11 +252,9 @@ public class LocalDevToolsAutoConfigurationTests { private ConfigurableApplicationContext getContext( Supplier supplier) throws Exception { - CountDownLatch latch = new CountDownLatch(1); AtomicReference atomicReference = new AtomicReference<>(); Thread thread = new Thread(() -> { ConfigurableApplicationContext context = supplier.get(); - latch.countDown(); atomicReference.getAndSet(context); }); thread.start(); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java index 4f82ae09961..7f037e5a043 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java @@ -16,7 +16,6 @@ package org.springframework.boot.devtools.autoconfigure; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; @@ -183,11 +182,9 @@ public class RemoteDevToolsAutoConfigurationTests { private AnnotationConfigServletWebApplicationContext getContext( Supplier supplier) throws Exception { - CountDownLatch latch = new CountDownLatch(1); AtomicReference atomicReference = new AtomicReference<>(); Thread thread = new Thread(() -> { AnnotationConfigServletWebApplicationContext context = supplier.get(); - latch.countDown(); atomicReference.getAndSet(context); }); thread.start(); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java index 0c73845a3dc..cbcf917163a 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java @@ -18,7 +18,6 @@ package org.springframework.boot.devtools.env; import java.net.URL; import java.util.Collections; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; @@ -122,11 +121,9 @@ public class DevToolPropertiesIntegrationTests { protected ConfigurableApplicationContext getContext( Supplier supplier) throws Exception { - CountDownLatch latch = new CountDownLatch(1); AtomicReference atomicReference = new AtomicReference<>(); Thread thread = new Thread(() -> { ConfigurableApplicationContext context = supplier.get(); - latch.countDown(); atomicReference.getAndSet(context); }); thread.start(); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java index 655806d4d65..1ed5f1e1aec 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java @@ -21,7 +21,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Properties; -import java.util.concurrent.CountDownLatch; import org.junit.Before; import org.junit.Rule; @@ -74,10 +73,8 @@ public class DevToolsHomePropertiesPostProcessorTests { } protected void runPostProcessor(Runnable runnable) throws Exception { - CountDownLatch latch = new CountDownLatch(1); Thread thread = new Thread(() -> { runnable.run(); - latch.countDown(); }); thread.start(); thread.join(); From ef11af8676e6479189393541e74c7407987251fc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 9 May 2019 12:10:33 +0100 Subject: [PATCH 2/2] Polish "Remove unnecessary latches in tests" Closes gh-16733 --- .../env/DevToolsHomePropertiesPostProcessorTests.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java index 1ed5f1e1aec..cb2a71a99f8 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java +++ b/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. @@ -73,9 +73,7 @@ public class DevToolsHomePropertiesPostProcessorTests { } protected void runPostProcessor(Runnable runnable) throws Exception { - Thread thread = new Thread(() -> { - runnable.run(); - }); + Thread thread = new Thread(runnable); thread.start(); thread.join(); }