root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polishing
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details

This commit is contained in:
Juergen Hoeller 2025-05-13 16:08:57 +02:00
parent 4d296fb4ca
commit 73f1c5a189
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
View File

@ -231,7 +231,6 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment); super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
} }
@Override @Override
public boolean containsProperty(String name) { public boolean containsProperty(String name) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) { 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}. * Fallback {@link PropertySource} that delegates to a raw {@link Environment}.
* <p>Should never apply in a regular scenario, since the {@code Environment} * <p>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); super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
} }
@Override @Override
public boolean containsProperty(String name) { public boolean containsProperty(String name) {
return super.source.containsProperty(name); return super.source.containsProperty(name);

5
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; private long readTimeout = -1;
/** /**
* Create a new instance of the {@code HttpComponentsClientHttpRequestFactory} * Create a new instance of the {@code HttpComponentsClientHttpRequestFactory}
* with a default {@link HttpClient} based on system properties. * 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.
* <p>The default implementation returns {@code null}. * <p>The default implementation returns {@code null}.
* @param httpMethod the HTTP method * @param httpMethod the HTTP method
* @param uri the URI * @param uri the URI