From db41e0d7d5cd120892df8f7196021f0c35ec9136 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 17 Jul 2015 14:02:38 +0200 Subject: [PATCH] Fix duplicate meta-data for server.session-timeout Closes gh-3537 --- .../boot/autoconfigure/web/ServerProperties.java | 10 ---------- .../additional-spring-configuration-metadata.json | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 5adf201a403..0855fb59d92 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -197,16 +197,6 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord this.address = address; } - /** - * Set the session timeout - * @return the session timeout - * @deprecated since 1.3.0 in favor of {@code session.timeout}. - */ - @Deprecated - public Integer getSessionTimeout() { - return this.session.getTimeout(); - } - /** * Get the session timeout * @param sessionTimeout the session timeout diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 167a2dd7568..8a0aaa1a0fc 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -166,6 +166,7 @@ "name": "server.session-timeout", "type": "java.lang.Integer", "description": "Session timeout in seconds.", + "sourceType": "org.springframework.boot.autoconfigure.web.ServerProperties", "deprecation": { "replacement": "server.session.timeout" }