Remove redundant hasText check in DataSourceHealthIndicator

.bomr/bomr.yaml

@@ -6,7 +6,7 @@ bomr:
       repository: spring-boot
       issue-labels:
         - 'type: dependency-upgrade'
-    policy: same-minor-version
+    policy: same-major-version
     prohibited:
       - project: derby
         versions:

README.adoc

@@ -1,4 +1,4 @@
-= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-2.2.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-2.2.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
+= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-2.3.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-2.3.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 :docs: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
 :github: https://github.com/spring-projects/spring-boot
 

ci/README.adoc

@@ -11,7 +11,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring-boot set-pipeline -p spring-boot-2.2.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring-boot set-pipeline -p spring-boot-2.3.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate

ci/parameters.yml

@@ -5,7 +5,7 @@ github-repo: "https://github.com/spring-projects/spring-boot.git"
 github-repo-name: "spring-projects/spring-boot"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "2.2.x"
+branch: "master"
 build-name: "spring-boot"
 pipeline-name: "spring-boot"
 concourse-url: "https://ci.spring.io"

ci/pipeline.yml

@@ -77,23 +77,23 @@ resources:
     repository: ((docker-hub-organization))/spring-boot-ci-image
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-    tag: 2.2.x
+    tag: 2.3.x
 - name: spring-boot-jdk11-ci-image
   type: docker-image
   icon: docker
   source:
     repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-    tag: 2.2.x
+    tag: 2.3.x
 - name: spring-boot-jdk13-ci-image
   type: docker-image
   icon: docker
   source:
     repository: ((docker-hub-organization))/spring-boot-jdk13-ci-image
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-    tag: 2.2.x
+    tag: 2.3.x
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant

eclipse/spring-boot-project.setup

@@ -11,8 +11,8 @@
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
     xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
-    name="spring.boot.2.2.x"
-    label="Spring Boot 2.2.x">
+    name="spring.boot.2.3.x"
+    label="Spring Boot 2.3.x">
   <setupTask
       xsi:type="setup:VariableTask"
       type="FOLDER"

pom.xml

@@ -10,7 +10,7 @@
 	<name>Spring Boot Build</name>
 	<description>Spring Boot Build</description>
 	<properties>
-		<revision>2.2.2.BUILD-SNAPSHOT</revision>
+		<revision>2.3.0.BUILD-SNAPSHOT</revision>
 		<main.basedir>${basedir}</main.basedir>
 	</properties>
 	<!-- Most elements are in profiles so they are stripped out during maven-flatten -->

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jdbc/DataSourceHealthIndicator.java

@@ -107,17 +107,16 @@ private void doDataSourceHealthCheck(Health.Builder builder) throws Exception {
 		String product = getProduct();
 		builder.up().withDetail("database", product);
 		String validationQuery = getValidationQuery(product);
-		if (StringUtils.hasText(validationQuery)) {
-			try {
-				// Avoid calling getObject as it breaks MySQL on Java 7
-				List<Object> results = this.jdbcTemplate.query(validationQuery, new SingleColumnRowMapper());
-				Object result = DataAccessUtils.requiredSingleResult(results);
-				builder.withDetail("result", result);
-			}
-			finally {
-				builder.withDetail("validationQuery", validationQuery);
-			}
+		try {
+			// Avoid calling getObject as it breaks MySQL on Java 7
+			List<Object> results = this.jdbcTemplate.query(validationQuery, new SingleColumnRowMapper());
+			Object result = DataAccessUtils.requiredSingleResult(results);
+			builder.withDetail("result", result);
+		}
+		finally {
+			builder.withDetail("validationQuery", validationQuery);
 		}
+
 	}
 
 	private String getProduct() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java

@@ -27,8 +27,8 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.file.Files;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -106,7 +106,7 @@ private Resource dumpHeap(boolean live) throws IOException, InterruptedException
 	}
 
 	private File createTempFile(boolean live) throws IOException {
-		String date = new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date());
+		String date = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm").format(LocalDateTime.now());
 		File file = File.createTempFile("heapdump" + date + (live ? "-live" : ""), ".hprof");
 		file.delete();
 		return file;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java

@@ -23,8 +23,8 @@
 import java.lang.management.MonitorInfo;
 import java.lang.management.RuntimeMXBean;
 import java.lang.management.ThreadInfo;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -47,8 +47,8 @@ String format(ThreadInfo[] threads) {
 	}
 
 	private void writePreamble(PrintWriter writer) {
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		writer.println(dateFormat.format(new Date()));
+		DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		writer.println(dateFormat.format(LocalDateTime.now()));
 		RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
 		writer.printf("Full thread dump %s (%s %s):%n", runtime.getVmName(), runtime.getVmVersion(),
 				System.getProperty("java.vm.info"));

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapterTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.actuate.health;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
@@ -44,7 +46,7 @@ void delegateThrowError() {
 		HealthIndicator delegate = mock(HealthIndicator.class);
 		HealthIndicatorReactiveAdapter adapter = new HealthIndicatorReactiveAdapter(delegate);
 		given(delegate.health()).willThrow(new IllegalStateException("Expected"));
-		StepVerifier.create(adapter.health()).expectError(IllegalStateException.class);
+		StepVerifier.create(adapter.health()).expectError(IllegalStateException.class).verify(Duration.ofSeconds(10));
 	}
 
 	@Test

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java

@@ -124,6 +124,7 @@ private RabbitConnectionFactoryBean getRabbitConnectionFactoryBean(RabbitPropert
 			map.from(properties::determineVirtualHost).whenNonNull().to(factory::setVirtualHost);
 			map.from(properties::getRequestedHeartbeat).whenNonNull().asInt(Duration::getSeconds)
 					.to(factory::setRequestedHeartbeat);
+			map.from(properties::getRequestedChannelMax).to(factory::setRequestedChannelMax);
 			RabbitProperties.Ssl ssl = properties.getSsl();
 			if (ssl.determineEnabled()) {
 				factory.setUseSSL(true);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -40,6 +40,7 @@
  * @author Josh Thornhill
  * @author Gary Russell
  * @author Artsiom Yudovin
+ * @author Franjo Zilic
  * @since 1.0.0
  */
 @ConfigurationProperties(prefix = "spring.rabbitmq")
@@ -87,6 +88,11 @@ public class RabbitProperties {
 	@DurationUnit(ChronoUnit.SECONDS)
 	private Duration requestedHeartbeat;
 
+	/**
+	 * Number of channels per connection requested by the client. Use 0 for unlimited.
+	 */
+	private int requestedChannelMax = 2047;
+
 	/**
 	 * Whether to enable publisher returns.
 	 */
@@ -275,6 +281,14 @@ public void setRequestedHeartbeat(Duration requestedHeartbeat) {
 		this.requestedHeartbeat = requestedHeartbeat;
 	}
 
+	public int getRequestedChannelMax() {
+		return this.requestedChannelMax;
+	}
+
+	public void setRequestedChannelMax(int requestedChannelMax) {
+		this.requestedChannelMax = requestedChannelMax;
+	}
+
 	@DeprecatedConfigurationProperty(reason = "replaced to support additional confirm types",
 			replacement = "spring.rabbitmq.publisher-confirm-type")
 	public boolean isPublisherConfirms() {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java

@@ -36,18 +36,6 @@
 @Order(Ordered.LOWEST_PRECEDENCE)
 public class MongoClientDependsOnBeanFactoryPostProcessor extends AbstractDependsOnBeanFactoryPostProcessor {
 
-	/**
-	 * Creates a new {@code MongoClientDependsOnBeanFactoryPostProcessor} that will set up
-	 * dependencies upon beans with the given names.
-	 * @param dependsOn names of the beans to depend upon
-	 * @deprecated since 2.1.7 in favor of
-	 * {@link #MongoClientDependsOnBeanFactoryPostProcessor(Class...)}
-	 */
-	@Deprecated
-	public MongoClientDependsOnBeanFactoryPostProcessor(String... dependsOn) {
-		super(MongoClient.class, MongoClientFactoryBean.class, dependsOn);
-	}
-
 	/**
 	 * Creates a new {@code MongoClientDependsOnBeanFactoryPostProcessor} that will set up
 	 * dependencies upon beans with the given types.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.java

@@ -37,18 +37,6 @@
 public class ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor
 		extends AbstractDependsOnBeanFactoryPostProcessor {
 
-	/**
-	 * Creates a new {@code ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor}
-	 * that will set up dependencies upon beans with the given names.
-	 * @param dependsOn names of the beans to depend upon
-	 * @deprecated since 2.1.7 in favor of
-	 * {@link #ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor(Class...)}
-	 */
-	@Deprecated
-	public ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor(String... dependsOn) {
-		super(MongoClient.class, ReactiveMongoClientFactoryBean.class, dependsOn);
-	}
-
 	/**
 	 * Creates a new {@code ReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor}
 	 * that will set up dependencies upon beans with the given types.