diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java index 11563360da..7df8bf086a 100644 --- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java +++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java @@ -231,7 +231,6 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment); } - @Override public boolean containsProperty(String name) { for (PropertySource propertySource : super.source.getPropertySources()) { @@ -260,6 +259,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS } } + /** * Fallback {@link PropertySource} that delegates to a raw {@link Environment}. *

Should never apply in a regular scenario, since the {@code Environment} @@ -272,7 +272,6 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment); } - @Override public boolean containsProperty(String name) { return super.source.containsProperty(name); diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java index bbddc4f05d..bbcdcc87f8 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -75,6 +75,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest private long readTimeout = -1; + /** * Create a new instance of the {@code HttpComponentsClientHttpRequestFactory} * with a default {@link HttpClient} based on system properties. @@ -371,7 +372,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest } /** - * Template methods that creates a {@link HttpContext} for the given HTTP method and URI. + * Template method that creates a {@link HttpContext} for the given HTTP method and URI. *

The default implementation returns {@code null}. * @param httpMethod the HTTP method * @param uri the URI