Merge branch '4.0.x'

Author: snicoll

smoke-test/spring-boot-smoke-test-restclient/src/main/java/aaaa/Gh49223AutoConfiguration.java

@@ -1,11 +1,27 @@
+/*
+ * Copyright 2012-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package aaaa;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 
 @AutoConfiguration(afterName = { "org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration",
 		"org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration" })
-class Gh49223AutoConfiguration {
+public final class Gh49223AutoConfiguration {
 
 	// Class must be in a package name that is ordered early
 
-}
+}

smoke-test/spring-boot-smoke-test-restclient/src/test/java/smoketest/restclient/SampleRestClientApplicationGh49223Tests.java

@@ -17,6 +17,7 @@
 package smoketest.restclient;
 
 import java.util.List;
+import java.util.Objects;
 
 import org.junit.jupiter.api.Test;
 import tools.jackson.databind.DeserializationFeature;
@@ -38,7 +39,8 @@ class SampleRestClientApplicationGh49223Tests {
 	@Test
 	void applicationStarts() {
 		RestClient restClient = this.restClientBuilder.build();
-		List<?> messageConverters = (List<?>) ReflectionTestUtils.getField(restClient, "messageConverters");
+		List<?> messageConverters = (List<?>) Objects
+			.requireNonNull(ReflectionTestUtils.getField(restClient, "messageConverters"));
 		JacksonJsonHttpMessageConverter jacksonConverter = (JacksonJsonHttpMessageConverter) messageConverters.stream()
 			.filter((converter) -> converter instanceof JacksonJsonHttpMessageConverter)
 			.findFirst()