spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 02:09:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-48949
This commit is contained in:
Andy Wilkinson
2026-01-23 10:36:38 +00:00
parent 7853ceec81 efac1bf83a
commit 27e3ddc7fb
9 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/ApiversionProperties.java
-3
View File
@@ -18,7 +18,6 @@ package org.springframework.boot.http.client.autoconfigure;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
import org.springframework.boot.context.properties.bind.Name;
/**
@@ -27,7 +26,6 @@ import org.springframework.boot.context.properties.bind.Name;
* @author Phillip Webb
* @since 4.0.0
*/
@ConfigurationPropertiesSource
public class ApiversionProperties {
/**
@@ -53,7 +51,6 @@ public class ApiversionProperties {
return this.insert;
}
@ConfigurationPropertiesSource
public static class Insert {
/**
module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientProperties.java
-2
View File
@@ -22,7 +22,6 @@ import java.util.Map;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
@@ -34,7 +33,6 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
* @author Phillip Webb
* @since 4.0.0
*/
@ConfigurationPropertiesSource
public class HttpClientProperties extends HttpClientSettingsProperties {
/**
module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsProperties.java
-3
View File
@@ -20,7 +20,6 @@ import java.time.Duration;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
import org.springframework.boot.http.client.HttpClientSettings;
import org.springframework.boot.http.client.HttpRedirects;
@@ -31,7 +30,6 @@ import org.springframework.boot.http.client.HttpRedirects;
* @since 4.0.0
* @see HttpClientSettings
*/
@ConfigurationPropertiesSource
public abstract class HttpClientSettingsProperties {
/**
@@ -85,7 +83,6 @@ public abstract class HttpClientSettingsProperties {
/**
* SSL configuration.
*/
@ConfigurationPropertiesSource
public static class Ssl {
/**
module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/properties/PushRegistryProperties.java
-3
View File
@@ -18,8 +18,6 @@ package org.springframework.boot.micrometer.metrics.autoconfigure.export.propert
import java.time.Duration;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
/**
* Base class for properties that configure a metrics registry that pushes aggregated
* metrics on a regular interval.
@@ -29,7 +27,6 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesSource
* @author Stephane Nicoll
* @since 4.0.0
*/
@ConfigurationPropertiesSource
public abstract class PushRegistryProperties {
/**
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Compression.java
-2
View File
@@ -18,7 +18,6 @@ package org.springframework.boot.web.server;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
import org.springframework.util.StringUtils;
import org.springframework.util.unit.DataSize;
@@ -30,7 +29,6 @@ import org.springframework.util.unit.DataSize;
* @author Stephane Nicoll
* @since 2.0.0
*/
@ConfigurationPropertiesSource
public class Compression {
/**
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Cookie.java
-2
View File
@@ -21,7 +21,6 @@ import java.time.temporal.ChronoUnit;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
import org.springframework.boot.convert.DurationUnit;
/**
@@ -33,7 +32,6 @@ import org.springframework.boot.convert.DurationUnit;
* @author Weix Sun
* @since 2.6.0
*/
@ConfigurationPropertiesSource
public class Cookie {
/**
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Http2.java
-3
View File
@@ -16,15 +16,12 @@
package org.springframework.boot.web.server;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
/**
* Simple server-independent abstraction for HTTP/2 configuration.
*
* @author Brian Clozel
* @since 2.0.0
*/
@ConfigurationPropertiesSource
public class Http2 {
/**
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Jsp.java
-3
View File
@@ -19,8 +19,6 @@ package org.springframework.boot.web.server.servlet;
import java.util.HashMap;
import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
/**
* Configuration for the server's JSP servlet.
*
@@ -28,7 +26,6 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesSource
* @author Stephane Nicoll
* @since 4.0.0
*/
@ConfigurationPropertiesSource
public class Jsp {
/**
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Session.java
-2
View File
@@ -23,7 +23,6 @@ import java.util.Set;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationPropertiesSource;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.boot.convert.DurationUnit;
import org.springframework.boot.web.server.Cookie;
@@ -34,7 +33,6 @@ import org.springframework.boot.web.server.Cookie;
* @author Andy Wilkinson
* @since 4.0.0
*/
@ConfigurationPropertiesSource
public class Session {
/**