Boot 3.x best practice.

Update Unit tests with SpringJunitConfig
Apply text blocks where appropriate.

Author: Corneil du Plessis

spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker/src/main/java/org/springframework/cloud/dataflow/common/test/docker/compose/connection/DockerPort.java

@@ -21,12 +21,16 @@
 import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.SocketException;
+import java.net.URI;
 import java.net.URL;
 import java.util.Objects;
 import java.util.function.Function;
+
 import javax.net.ssl.SSLHandshakeException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.cloud.dataflow.common.test.docker.compose.connection.waiting.SuccessOrFailure;
 
 public class DockerPort {
@@ -76,7 +80,7 @@ public SuccessOrFailure isHttpRespondingSuccessfully(Function<DockerPort, String
         try {
             String urlString = urlFunction.apply(this);
             log.trace("Trying to connect to {}", urlString);
-            url = new URL(urlString);
+            url = URI.create(urlString).toURL();
         } catch (MalformedURLException e) {
             throw new RuntimeException("Could not create URL for connecting to localhost", e);
         }

spring-cloud-dataflow-composed-task-runner/src/main/java/org/springframework/cloud/dataflow/composedtaskrunner/ComposedTaskStepExecutionListener.java

@@ -21,7 +21,7 @@
 
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.listener.StepExecutionListenerSupport;
+import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.cloud.task.repository.TaskExecution;
 import org.springframework.cloud.task.repository.TaskExplorer;
 import org.springframework.util.Assert;
@@ -35,7 +35,7 @@
  * @author Glenn Renfro
  * @author Corneil du Plessis
  */
-public class ComposedTaskStepExecutionListener extends StepExecutionListenerSupport {
+public class ComposedTaskStepExecutionListener implements StepExecutionListener {
 	private final static Logger logger = LoggerFactory.getLogger(ComposedTaskStepExecutionListener.class);
 
 	private final TaskExplorer taskExplorer;

spring-cloud-dataflow-composed-task-runner/src/test/java/org/springframework/cloud/dataflow/composedtaskrunner/ComposedTaskRunnerConfigurationNoPropertiesTests.java

@@ -21,7 +21,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
@@ -36,9 +35,8 @@
 import org.springframework.cloud.dataflow.rest.client.TaskOperations;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.Assert;
 
@@ -49,8 +47,7 @@
 /**
  * @author Glenn Renfro
  */
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {EmbeddedDataSourceConfiguration.class,
+@SpringJUnitConfig(classes = {EmbeddedDataSourceConfiguration.class,
 		DataFlowTestConfiguration.class, StepBeanDefinitionRegistrar.class,
 		ComposedTaskRunnerConfiguration.class,
 		StepBeanDefinitionRegistrar.class})

spring-cloud-dataflow-composed-task-runner/src/test/java/org/springframework/cloud/dataflow/composedtaskrunner/ComposedTaskRunnerConfigurationWithPropertiesTests.java

@@ -16,16 +16,13 @@
 
 package org.springframework.cloud.dataflow.composedtaskrunner;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
@@ -41,9 +38,8 @@
 import org.springframework.cloud.task.configuration.TaskProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.Assert;
 
@@ -54,8 +50,7 @@
 /**
  * @author Glenn Renfro
  */
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {EmbeddedDataSourceConfiguration.class,
+@SpringJUnitConfig(classes = {EmbeddedDataSourceConfiguration.class,
 		DataFlowTestConfiguration.class, StepBeanDefinitionRegistrar.class,
 		ComposedTaskRunnerConfiguration.class,
 		StepBeanDefinitionRegistrar.class})

spring-cloud-dataflow-composed-task-runner/src/test/java/org/springframework/cloud/dataflow/composedtaskrunner/ComposedTaskRunnerStepFactoryTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.cloud.dataflow.composedtaskrunner;
 
-import javax.sql.DataSource;
-
-
 import javax.sql.DataSource;
 
 import org.junit.jupiter.api.Test;
@@ -30,6 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
+import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.common.security.CommonSecurityAutoConfiguration;
 import org.springframework.cloud.dataflow.composedtaskrunner.configuration.DataFlowTestConfiguration;
@@ -43,9 +41,7 @@
 import org.springframework.cloud.task.repository.support.SimpleTaskNameResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.transaction.PlatformTransactionManager;
 
@@ -100,6 +96,7 @@ public StepBuilder steps() {
 		}
 
 		@Bean
+		@DependsOnDatabaseInitialization
 		public TaskConfigurer taskConfigurer() {
 			return new TaskConfigurer() {
 				@Override

spring-cloud-dataflow-composed-task-runner/src/test/java/org/springframework/cloud/dataflow/composedtaskrunner/TaskLauncherTaskletTests.java

@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.sql.DataSource;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -43,6 +44,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
 import org.springframework.cloud.dataflow.composedtaskrunner.properties.ComposedTaskProperties;
 import org.springframework.cloud.dataflow.composedtaskrunner.support.ComposedTaskException;
 import org.springframework.cloud.dataflow.composedtaskrunner.support.TaskExecutionTimeoutException;
@@ -506,6 +508,7 @@ private void mockReturnValForTaskExecution(long executionId) {
 	public static class TestConfiguration {
 
 		@Bean
+		@DependsOnDatabaseInitialization
 		TaskRepositoryInitializer taskRepositoryInitializer() {
 			return new TaskRepositoryInitializer(new TaskProperties());
 		}

spring-cloud-dataflow-configuration-metadata/src/main/java/org/springframework/cloud/dataflow/configuration/metadata/container/DefaultContainerImageMetadataResolver.java

@@ -104,11 +104,11 @@ public Map<String, String> getImageLabels(String imageName) {
 	}
 
 	private static int asInt(Object value) {
-		if (value instanceof Number) {
-			return ((Number) value).intValue();
+		if (value instanceof Number number) {
+			return number.intValue();
 		}
-		else if (value instanceof String) {
-			return Integer.parseInt((String) value);
+		else if (value instanceof String string) {
+			return Integer.parseInt(string);
 		}
 		else if (value != null) {
 			return Integer.parseInt(value.toString());

spring-cloud-dataflow-container-registry/src/main/java/org/springframework/cloud/dataflow/container/registry/ContainerImageRestTemplateFactory.java

@@ -16,9 +16,6 @@
 
 package org.springframework.cloud.dataflow.container.registry;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
@@ -28,19 +25,22 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.cookie.StandardCookieSpec;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
 import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
 import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.Lookup;
-import org.apache.hc.core5.http.config.Registry;
 import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.dataflow.container.registry.authorization.DropAuthorizationHeaderRequestRedirectStrategy;

spring-cloud-dataflow-platform-cloudfoundry/src/test/java/org/springframework/cloud/dataflow/server/config/cloudfoundry/CloudFoundryTaskPlatformFactoryTests.java

@@ -16,18 +16,13 @@
 
 package org.springframework.cloud.dataflow.server.config.cloudfoundry;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.net.URL;
+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import io.pivotal.scheduler.SchedulerClient;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v2.Metadata;
 import org.cloudfoundry.client.v2.info.GetInfoResponse;
@@ -41,6 +36,7 @@
 import org.cloudfoundry.reactor.TokenProvider;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
 
 import org.springframework.cloud.dataflow.core.Launcher;
 import org.springframework.cloud.dataflow.core.TaskPlatform;
@@ -50,8 +46,11 @@
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryTaskLauncher;
 
-import io.pivotal.scheduler.SchedulerClient;
-import reactor.core.publisher.Mono;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * @author David Turanski
@@ -101,7 +100,7 @@ void setUp() throws Exception {
 		this.defaultConnectionProperties = new CloudFoundryConnectionProperties();
 		this.defaultConnectionProperties.setOrg("org");
 		this.defaultConnectionProperties.setSpace("space");
-		this.defaultConnectionProperties.setUrl(new URL("https://localhost:9999"));
+		this.defaultConnectionProperties.setUrl(URI.create("https://localhost:9999").toURL());
 
 		this.deploymentProperties = new CloudFoundryDeploymentProperties();
 		this.deploymentProperties.setApiTimeout(1L);
@@ -213,7 +212,7 @@ private void setupMultiPlatform() throws Exception{
 		this.anotherOrgSpaceConnectionProperties = new CloudFoundryConnectionProperties();
 		this.anotherOrgSpaceConnectionProperties.setOrg("another-org");
 		this.anotherOrgSpaceConnectionProperties.setSpace("another-space");
-		this.anotherOrgSpaceConnectionProperties.setUrl(new URL("https://localhost:9999"));
+		this.anotherOrgSpaceConnectionProperties.setUrl(URI.create("https://localhost:9999").toURL());
 
 
 		CloudFoundryProperties cloudFoundryProperties = new CloudFoundryProperties();

spring-cloud-dataflow-platform-kubernetes/src/main/java/org/springframework/cloud/dataflow/server/config/kubernetes/KubernetesSchedulerAutoConfiguration.java

@@ -17,12 +17,12 @@
 package org.springframework.cloud.dataflow.server.config.kubernetes;
 
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.dataflow.server.config.features.SchedulerConfiguration;
 import org.springframework.cloud.deployer.spi.kubernetes.KubernetesSchedulerProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
 
@@ -32,8 +32,8 @@
  *
  * @author Chris Schaefer
  */
-@Configuration
-@Conditional({ SchedulerConfiguration.SchedulerConfigurationPropertyChecker.class })
+@AutoConfiguration
+@Conditional({SchedulerConfiguration.SchedulerConfigurationPropertyChecker.class})
 @Profile("kubernetes")
 public class KubernetesSchedulerAutoConfiguration {