Merge branch '3.3.x'

philwebb · philwebb · commit 916efb632c9d · 2024-12-04T15:04:22.000-08:00
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
@@ -32,7 +32,7 @@
 import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.ManagedBeanSettings;
 
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
@@ -121,7 +121,7 @@ private List<HibernatePropertiesCustomizer> determineHibernatePropertiesCustomiz
 		List<HibernatePropertiesCustomizer> customizers = new ArrayList<>();
 		if (ClassUtils.isPresent("org.hibernate.resource.beans.container.spi.BeanContainer",
 				getClass().getClassLoader())) {
-			customizers.add((properties) -> properties.put(AvailableSettings.BEAN_CONTAINER,
+			customizers.add((properties) -> properties.put(ManagedBeanSettings.BEAN_CONTAINER,
 					new SpringBeanContainer(beanFactory)));
 		}
 		if (physicalNamingStrategy != null || implicitNamingStrategy != null) {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
@@ -22,7 +22,9 @@
 import java.util.function.Supplier;
 
 import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
-import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.MappingSettings;
+import org.hibernate.cfg.PersistenceSettings;
+import org.hibernate.cfg.SchemaToolingSettings;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;
@@ -86,10 +88,10 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing
 		getNaming().applyNamingStrategies(result);
 		String ddlAuto = determineDdlAuto(existing, settings::getDdlAuto);
 		if (StringUtils.hasText(ddlAuto) && !"none".equals(ddlAuto)) {
-			result.put(AvailableSettings.HBM2DDL_AUTO, ddlAuto);
+			result.put(SchemaToolingSettings.HBM2DDL_AUTO, ddlAuto);
 		}
 		else {
-			result.remove(AvailableSettings.HBM2DDL_AUTO);
+			result.remove(SchemaToolingSettings.HBM2DDL_AUTO);
 		}
 		Collection<HibernatePropertiesCustomizer> customizers = settings.getHibernatePropertiesCustomizers();
 		if (!ObjectUtils.isEmpty(customizers)) {
@@ -99,20 +101,20 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing
 	}
 
 	private void applyScanner(Map<String, Object> result) {
-		if (!result.containsKey(AvailableSettings.SCANNER) && ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {
-			result.put(AvailableSettings.SCANNER, DISABLED_SCANNER_CLASS);
+		if (!result.containsKey(PersistenceSettings.SCANNER) && ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {
+			result.put(PersistenceSettings.SCANNER, DISABLED_SCANNER_CLASS);
 		}
 	}
 
 	private String determineDdlAuto(Map<String, String> existing, Supplier<String> defaultDdlAuto) {
-		String ddlAuto = existing.get(AvailableSettings.HBM2DDL_AUTO);
+		String ddlAuto = existing.get(SchemaToolingSettings.HBM2DDL_AUTO);
 		if (ddlAuto != null) {
 			return ddlAuto;
 		}
 		if (this.ddlAuto != null) {
 			return this.ddlAuto;
 		}
-		if (existing.get(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION) != null) {
+		if (existing.get(SchemaToolingSettings.JAKARTA_HBM2DDL_DATABASE_ACTION) != null) {
 			return null;
 		}
 		return defaultDdlAuto.get();
@@ -147,9 +149,9 @@ public void setPhysicalStrategy(String physicalStrategy) {
 		}
 
 		private void applyNamingStrategies(Map<String, Object> properties) {
-			applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,
+			applyNamingStrategy(properties, MappingSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,
 					SpringImplicitNamingStrategy.class::getName);
-			applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,
+			applyNamingStrategy(properties, MappingSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,
 					CamelCaseToUnderscoresNamingStrategy.class::getName);
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java
@@ -115,13 +115,20 @@ private OAuth2TokenValidator<Jwt> getValidators(OAuth2TokenValidator<Jwt> defaul
 			List<OAuth2TokenValidator<Jwt>> validators = new ArrayList<>();
 			validators.add(defaultValidator);
 			if (!CollectionUtils.isEmpty(audiences)) {
-				validators.add(new JwtClaimValidator<List<String>>(JwtClaimNames.AUD,
-						(aud) -> aud != null && !Collections.disjoint(aud, audiences)));
+				validators.add(audValidator(audiences));
 			}
 			validators.addAll(this.additionalValidators);
 			return new DelegatingOAuth2TokenValidator<>(validators);
 		}
 
+		private JwtClaimValidator<List<String>> audValidator(List<String> audiences) {
+			return new JwtClaimValidator<>(JwtClaimNames.AUD, (aud) -> nullSafeDisjoint(aud, audiences));
+		}
+
+		private boolean nullSafeDisjoint(List<String> c1, List<String> c2) {
+			return c1 != null && !Collections.disjoint(c1, c2);
+		}
+
 		@Bean
 		@Conditional(KeyValueCondition.class)
 		NimbusReactiveJwtDecoder jwtDecoderByPublicKeyValue() throws Exception {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java
@@ -114,13 +114,20 @@ private OAuth2TokenValidator<Jwt> getValidators(OAuth2TokenValidator<Jwt> defaul
 			List<OAuth2TokenValidator<Jwt>> validators = new ArrayList<>();
 			validators.add(defaultValidator);
 			if (!CollectionUtils.isEmpty(audiences)) {
-				validators.add(new JwtClaimValidator<List<String>>(JwtClaimNames.AUD,
-						(aud) -> aud != null && !Collections.disjoint(aud, audiences)));
+				validators.add(audValidator(audiences));
 			}
 			validators.addAll(this.additionalValidators);
 			return new DelegatingOAuth2TokenValidator<>(validators);
 		}
 
+		private JwtClaimValidator<List<String>> audValidator(List<String> audiences) {
+			return new JwtClaimValidator<>(JwtClaimNames.AUD, (aud) -> nullSafeDisjoint(aud, audiences));
+		}
+
+		private boolean nullSafeDisjoint(List<String> c1, List<String> c2) {
+			return c1 != null && !Collections.disjoint(c1, c2);
+		}
+
 		@Bean
 		@Conditional(KeyValueCondition.class)
 		JwtDecoder jwtDecoderByPublicKeyValue() throws Exception {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java
@@ -162,7 +162,7 @@ void renderTemplate() throws Exception {
 		MarkupTemplateEngine engine = config.getTemplateEngine();
 		Writer writer = new StringWriter();
 		engine.createTemplate(new ClassPathResource("templates/message.tpl").getFile())
-			.make(new HashMap<String, Object>(Collections.singletonMap("greeting", "Hello World")))
+			.make(new HashMap<>(Collections.singletonMap("greeting", "Hello World")))
 			.writeTo(writer);
 		assertThat(writer.toString()).contains("Hello World");
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java
@@ -21,7 +21,9 @@
 import java.util.function.Supplier;
 
 import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
-import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.MappingSettings;
+import org.hibernate.cfg.PersistenceSettings;
+import org.hibernate.cfg.SchemaToolingSettings;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -59,9 +61,9 @@ class HibernatePropertiesTests {
 	void noCustomNamingStrategy() {
 		this.contextRunner.run(assertHibernateProperties((hibernateProperties) -> {
 			assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
-			assertThat(hibernateProperties).containsEntry(AvailableSettings.PHYSICAL_NAMING_STRATEGY,
+			assertThat(hibernateProperties).containsEntry(MappingSettings.PHYSICAL_NAMING_STRATEGY,
 					CamelCaseToUnderscoresNamingStrategy.class.getName());
-			assertThat(hibernateProperties).containsEntry(AvailableSettings.IMPLICIT_NAMING_STRATEGY,
+			assertThat(hibernateProperties).containsEntry(MappingSettings.IMPLICIT_NAMING_STRATEGY,
 					SpringImplicitNamingStrategy.class.getName());
 		}));
 	}
@@ -73,8 +75,8 @@ void hibernate5CustomNamingStrategies() {
 					"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical")
 			.run(assertHibernateProperties((hibernateProperties) -> {
 				assertThat(hibernateProperties).contains(
-						entry(AvailableSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
-						entry(AvailableSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
+						entry(MappingSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
+						entry(MappingSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
 				assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
 			}));
 	}
@@ -87,24 +89,24 @@ void hibernate5CustomNamingStrategiesViaJpaProperties() {
 			.run(assertHibernateProperties((hibernateProperties) -> {
 				// You can override them as we don't provide any default
 				assertThat(hibernateProperties).contains(
-						entry(AvailableSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
-						entry(AvailableSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
+						entry(MappingSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
+						entry(MappingSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
 				assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
 			}));
 	}
 
 	@Test
 	void scannerUsesDisabledScannerByDefault() {
 		this.contextRunner.run(assertHibernateProperties((hibernateProperties) -> assertThat(hibernateProperties)
-			.containsEntry(AvailableSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.DisabledScanner")));
+			.containsEntry(PersistenceSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.DisabledScanner")));
 	}
 
 	@Test
 	void scannerCanBeCustomized() {
 		this.contextRunner.withPropertyValues(
 				"spring.jpa.properties.hibernate.archive.scanner:org.hibernate.boot.archive.scan.internal.StandardScanner")
-			.run(assertHibernateProperties((hibernateProperties) -> assertThat(hibernateProperties)
-				.containsEntry(AvailableSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.StandardScanner")));
+			.run(assertHibernateProperties((hibernateProperties) -> assertThat(hibernateProperties).containsEntry(
+					PersistenceSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.StandardScanner")));
 	}
 
 	@Test
@@ -125,16 +127,16 @@ void defaultDdlAutoIsNotInvokedAndDdlAutoIsNotSetIfJpaDbActionPropertyIsSet() {
 			.withPropertyValues(
 					"spring.jpa.properties.jakarta.persistence.schema-generation.database.action=drop-and-create")
 			.run(assertHibernateProperties((hibernateProperties) -> {
-				assertThat(hibernateProperties).doesNotContainKey(AvailableSettings.HBM2DDL_AUTO);
-				assertThat(hibernateProperties).containsEntry(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
+				assertThat(hibernateProperties).doesNotContainKey(SchemaToolingSettings.HBM2DDL_AUTO);
+				assertThat(hibernateProperties).containsEntry(SchemaToolingSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
 						"drop-and-create");
 				then(this.ddlAutoSupplier).should(never()).get();
 			}));
 	}
 
 	private ContextConsumer<AssertableApplicationContext> assertDefaultDdlAutoNotInvoked(String expectedDdlAuto) {
 		return assertHibernateProperties((hibernateProperties) -> {
-			assertThat(hibernateProperties).containsEntry(AvailableSettings.HBM2DDL_AUTO, expectedDdlAuto);
+			assertThat(hibernateProperties).containsEntry(SchemaToolingSettings.HBM2DDL_AUTO, expectedDdlAuto);
 			then(this.ddlAutoSupplier).should(never()).get();
 		});
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java
@@ -34,8 +34,8 @@
 import org.assertj.core.api.MapAssert;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
 import org.mockito.InOrder;
-import org.mockito.Mockito;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -153,7 +153,7 @@ void whenHasUserDefinedFailoverPropertiesAddsToClient() {
 						.getField(clientFactory, "customizer");
 					customizeAction.accept(pulsarClientBuilderCustomizer, target);
 					InOrder ordered = inOrder(target);
-					ordered.verify(target).serviceUrlProvider(Mockito.any(AutoClusterFailover.class));
+					ordered.verify(target).serviceUrlProvider(ArgumentMatchers.any(AutoClusterFailover.class));
 					assertThat(pulsarProperties.getClient().getFailover().getDelay()).isEqualTo(Duration.ofSeconds(15));
 					assertThat(pulsarProperties.getClient().getFailover().getSwitchBackDelay())
 						.isEqualTo(Duration.ofSeconds(30));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java
@@ -56,7 +56,7 @@ void wrapLocalValidatorFactoryBean() {
 		this.contextRunner.withUserConfiguration(LocalValidatorFactoryBeanConfig.class).run((context) -> {
 			ValidatorAdapter wrapper = context.getBean(ValidatorAdapter.class);
 			assertThat(wrapper.supports(SampleData.class)).isTrue();
-			MapBindingResult errors = new MapBindingResult(new HashMap<String, Object>(), "test");
+			MapBindingResult errors = new MapBindingResult(new HashMap<>(), "test");
 			wrapper.validate(new SampleData(40), errors);
 			assertThat(errors.getErrorCount()).isOne();
 		});
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
@@ -270,13 +270,13 @@ void deleteHandlesRelativeUris() throws IOException {
 	@Test
 	void exchangeWithRequestEntityAndClassHandlesRelativeUris() throws IOException {
 		verifyRelativeUriHandling((testRestTemplate, relativeUri) -> testRestTemplate
-			.exchange(new RequestEntity<String>(HttpMethod.GET, relativeUri), String.class));
+			.exchange(new RequestEntity<>(HttpMethod.GET, relativeUri), String.class));
 	}
 
 	@Test
 	void exchangeWithRequestEntityAndParameterizedTypeReferenceHandlesRelativeUris() throws IOException {
 		verifyRelativeUriHandling((testRestTemplate, relativeUri) -> testRestTemplate
-			.exchange(new RequestEntity<String>(HttpMethod.GET, relativeUri), new ParameterizedTypeReference<String>() {
+			.exchange(new RequestEntity<>(HttpMethod.GET, relativeUri), new ParameterizedTypeReference<String>() {
 			}));
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/StringSequence.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/StringSequence.java
@@ -76,6 +76,7 @@ public StringSequence subSequence(int start, int end) {
 	 * Returns {@code true} if the sequence is empty. Public to be compatible with JDK 15.
 	 * @return {@code true} if {@link #length()} is {@code 0}, otherwise {@code false}
 	 */
+	@Override
 	public boolean isEmpty() {
 		return length() == 0;
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
@@ -369,7 +369,7 @@ private void registerServletContainerInitializerToDriveServletContextInitializer
 		ServletContextInitializer[] mergedInitializers = mergeInitializers(initializers);
 		Initializer initializer = new Initializer(mergedInitializers);
 		deployment.addServletContainerInitializer(new ServletContainerInitializerInfo(Initializer.class,
-				new ImmediateInstanceFactory<ServletContainerInitializer>(initializer), NO_CLASSES));
+				new ImmediateInstanceFactory<>(initializer), NO_CLASSES));
 	}
 
 	private ClassLoader getServletClassLoader() {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java
@@ -139,8 +139,7 @@ void addServletRegistrationBeanMustNotBeNull() {
 	void setServletRegistrationBeanReplacesValue() throws Exception {
 		given(this.servletContext.addFilter(anyString(), any(Filter.class))).willReturn(this.registration);
 		AbstractFilterRegistrationBean<?> bean = createFilterRegistrationBean(mockServletRegistration("a"));
-		bean.setServletRegistrationBeans(
-				new LinkedHashSet<ServletRegistrationBean<?>>(Collections.singletonList(mockServletRegistration("b"))));
+		bean.setServletRegistrationBeans(new LinkedHashSet<>(Collections.singletonList(mockServletRegistration("b"))));
 		bean.onStartup(this.servletContext);
 		then(this.registration).should().addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST), false, "b");
 	}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java
@@ -50,7 +50,7 @@ void testHome() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
 		ResponseEntity<String> entity = this.restTemplate.withBasicAuth("user", getPassword())
-			.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers), String.class);
+			.exchange("/", HttpMethod.GET, new HttpEntity<>(headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).contains("<title>Hello");
 	}
@@ -74,7 +74,7 @@ void testError() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
 		ResponseEntity<String> entity = this.restTemplate.withBasicAuth("user", getPassword())
-			.exchange("/error", HttpMethod.GET, new HttpEntity<Void>(headers), String.class);
+			.exchange("/error", HttpMethod.GET, new HttpEntity<>(headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 		assertThat(entity.getBody()).contains("<html>")
 			.contains("<body>")
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java
@@ -48,7 +48,7 @@ class SampleServletApplicationTests {
 	void testHomeIsSecure() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers),
+		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<>(headers),
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java
@@ -55,7 +55,7 @@ class SampleWebSecureCustomApplicationTests {
 	void testHome() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
-		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers),
+		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<>(headers),
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		assertThat(entity.getHeaders().getLocation().toString()).endsWith(this.port + "/login");
@@ -65,8 +65,8 @@ void testHome() {
 	void testLoginPage() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
-		ResponseEntity<String> entity = this.restTemplate.exchange("/login", HttpMethod.GET,
-				new HttpEntity<Void>(headers), String.class);
+		ResponseEntity<String> entity = this.restTemplate.exchange("/login", HttpMethod.GET, new HttpEntity<>(headers),
+				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).contains("<title>Login</title>");
 	}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/test/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/src/test/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
@@ -55,7 +55,7 @@ class SampleWebSecureJdbcApplicationTests {
 	void testHome() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
-		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers),
+		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<>(headers),
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		assertThat(entity.getHeaders().getLocation().toString()).endsWith(this.port + "/login");
@@ -65,8 +65,8 @@ void testHome() {
 	void testLoginPage() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
-		ResponseEntity<String> entity = this.restTemplate.exchange("/login", HttpMethod.GET,
-				new HttpEntity<Void>(headers), String.class);
+		ResponseEntity<String> entity = this.restTemplate.exchange("/login", HttpMethod.GET, new HttpEntity<>(headers),
+				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).contains("<title>Login</title>");
 	}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleWebSecureApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleWebSecureApplicationTests.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@`
`22`	`22`	`import java.util.function.Supplier;`
`23`	`23`
`24`	`24`	`import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;`
`25`		`-import org.hibernate.cfg.AvailableSettings;`
	`25`	`+import org.hibernate.cfg.MappingSettings;`
	`26`	`+import org.hibernate.cfg.PersistenceSettings;`
	`27`	`+import org.hibernate.cfg.SchemaToolingSettings;`
`26`	`28`
`27`	`29`	`import org.springframework.boot.context.properties.ConfigurationProperties;`
`28`	`30`	`import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;`
`@@ -86,10 +88,10 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing`
`86`	`88`	`getNaming().applyNamingStrategies(result);`
`87`	`89`	`String ddlAuto = determineDdlAuto(existing, settings::getDdlAuto);`
`88`	`90`	`if (StringUtils.hasText(ddlAuto) && !"none".equals(ddlAuto)) {`
`89`		`- result.put(AvailableSettings.HBM2DDL_AUTO, ddlAuto);`
	`91`	`+ result.put(SchemaToolingSettings.HBM2DDL_AUTO, ddlAuto);`
`90`	`92`	`}`
`91`	`93`	`else {`
`92`		`- result.remove(AvailableSettings.HBM2DDL_AUTO);`
	`94`	`+ result.remove(SchemaToolingSettings.HBM2DDL_AUTO);`
`93`	`95`	`}`
`94`	`96`	`Collection<HibernatePropertiesCustomizer> customizers = settings.getHibernatePropertiesCustomizers();`
`95`	`97`	`if (!ObjectUtils.isEmpty(customizers)) {`
`@@ -99,20 +101,20 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`private void applyScanner(Map<String, Object> result) {`
`102`		`- if (!result.containsKey(AvailableSettings.SCANNER) && ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {`
`103`		`- result.put(AvailableSettings.SCANNER, DISABLED_SCANNER_CLASS);`
	`104`	`+ if (!result.containsKey(PersistenceSettings.SCANNER) && ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {`
	`105`	`+ result.put(PersistenceSettings.SCANNER, DISABLED_SCANNER_CLASS);`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`private String determineDdlAuto(Map<String, String> existing, Supplier<String> defaultDdlAuto) {`
`108`		`- String ddlAuto = existing.get(AvailableSettings.HBM2DDL_AUTO);`
	`110`	`+ String ddlAuto = existing.get(SchemaToolingSettings.HBM2DDL_AUTO);`
`109`	`111`	`if (ddlAuto != null) {`
`110`	`112`	`return ddlAuto;`
`111`	`113`	`}`
`112`	`114`	`if (this.ddlAuto != null) {`
`113`	`115`	`return this.ddlAuto;`
`114`	`116`	`}`
`115`		`- if (existing.get(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION) != null) {`
	`117`	`+ if (existing.get(SchemaToolingSettings.JAKARTA_HBM2DDL_DATABASE_ACTION) != null) {`
`116`	`118`	`return null;`
`117`	`119`	`}`
`118`	`120`	`return defaultDdlAuto.get();`
`@@ -147,9 +149,9 @@ public void setPhysicalStrategy(String physicalStrategy) {`
`147`	`149`	`}`
`148`	`150`
`149`	`151`	`private void applyNamingStrategies(Map<String, Object> properties) {`
`150`		`- applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,`
	`152`	`+ applyNamingStrategy(properties, MappingSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,`
`151`	`153`	`SpringImplicitNamingStrategy.class::getName);`
`152`		`- applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,`
	`154`	`+ applyNamingStrategy(properties, MappingSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,`
`153`	`155`	`CamelCaseToUnderscoresNamingStrategy.class::getName);`
`154`	`156`	`}`
`155`	`157`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void renderTemplate() throws Exception {`
`162`	`162`	`MarkupTemplateEngine engine = config.getTemplateEngine();`
`163`	`163`	`Writer writer = new StringWriter();`
`164`	`164`	`engine.createTemplate(new ClassPathResource("templates/message.tpl").getFile())`
`165`		`- .make(new HashMap<String, Object>(Collections.singletonMap("greeting", "Hello World")))`
	`165`	`+ .make(new HashMap<>(Collections.singletonMap("greeting", "Hello World")))`
`166`	`166`	`.writeTo(writer);`
`167`	`167`	`assertThat(writer.toString()).contains("Hello World");`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,13 +270,13 @@ void deleteHandlesRelativeUris() throws IOException {`
`270`	`270`	`@Test`
`271`	`271`	`void exchangeWithRequestEntityAndClassHandlesRelativeUris() throws IOException {`
`272`	`272`	`verifyRelativeUriHandling((testRestTemplate, relativeUri) -> testRestTemplate`
`273`		`- .exchange(new RequestEntity<String>(HttpMethod.GET, relativeUri), String.class));`
	`273`	`+ .exchange(new RequestEntity<>(HttpMethod.GET, relativeUri), String.class));`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`@Test`
`277`	`277`	`void exchangeWithRequestEntityAndParameterizedTypeReferenceHandlesRelativeUris() throws IOException {`
`278`	`278`	`verifyRelativeUriHandling((testRestTemplate, relativeUri) -> testRestTemplate`
`279`		`- .exchange(new RequestEntity<String>(HttpMethod.GET, relativeUri), new ParameterizedTypeReference<String>() {`
	`279`	`+ .exchange(new RequestEntity<>(HttpMethod.GET, relativeUri), new ParameterizedTypeReference<String>() {`
`280`	`280`	`}));`
`281`	`281`	`}`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public StringSequence subSequence(int start, int end) {`
`76`	`76`	`* Returns {@code true} if the sequence is empty. Public to be compatible with JDK 15.`
`77`	`77`	`* @return {@code true} if {@link #length()} is {@code 0}, otherwise {@code false}`
`78`	`78`	`*/`
	`79`	`+ @Override`
`79`	`80`	`public boolean isEmpty() {`
`80`	`81`	`return length() == 0;`
`81`	`82`	`}`