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

Move session endpoint auto-configuration into spring-boot-session

Browse Source 
Closes gh-46139
This commit is contained in:
Andy Wilkinson
2025-07-01 12:00:43 +01:00
parent 1ec5db4faf
commit 92076fee14
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle
-2
View File
@@ -67,7 +67,6 @@ dependencies {
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
optional(project(":spring-boot-project:spring-boot-security-saml2"))
optional(project(":spring-boot-project:spring-boot-session"))
optional(project(":spring-boot-project:spring-boot-tomcat"))
optional(project(":spring-boot-project:spring-boot-undertow"))
optional(project(":spring-boot-project:spring-boot-validation"))
@@ -160,7 +159,6 @@ dependencies {
optional("org.springframework.kafka:spring-kafka")
optional("org.springframework.security:spring-security-config")
optional("org.springframework.security:spring-security-web")
optional("org.springframework.session:spring-session-core")
optional("redis.clients:jedis")
testImplementation(project(":spring-boot-project:spring-boot-data-rest"))
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
-1
View File
@@ -77,7 +77,6 @@ org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpoint
org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksObservabilityAutoConfiguration
org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
org.springframework.boot.actuate.autoconfigure.session.SessionsEndpointAutoConfiguration
org.springframework.boot.actuate.autoconfigure.ssl.SslHealthContributorAutoConfiguration
org.springframework.boot.actuate.autoconfigure.ssl.SslObservabilityAutoConfiguration
org.springframework.boot.actuate.autoconfigure.startup.StartupEndpointAutoConfiguration
spring-boot-project/spring-boot-session/build.gradle
+1 -1
View File
@@ -32,7 +32,7 @@ dependencies {
implementation(project(":spring-boot-project:spring-boot-web-server"))
optional(project(":spring-boot-project:spring-boot-actuator"))
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
optional("io.projectreactor:reactor-core")
optional("jakarta.servlet:jakarta.servlet-api")
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfiguration.java → spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/autoconfigure/SessionsEndpointAutoConfiguration.java
+5 -4
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.actuate.autoconfigure.session;
package org.springframework.boot.session.actuate.endpoint.autoconfigure;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
@@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.session.actuate.endpoint.ReactiveSessionsEndpoint;
import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint;
import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.session.FindByIndexNameSessionRepository;
@@ -39,10 +40,10 @@ import org.springframework.session.SessionRepository;
* {@link EnableAutoConfiguration Auto-configuration} for {@link SessionsEndpoint}.
*
* @author Vedran Pavic
* @since 2.0.0
* @since 4.0.0
*/
@AutoConfiguration(afterName = "org.springframework.boot.session.autoconfigure.SessionAutoConfiguration")
@ConditionalOnClass({ Session.class, SessionsEndpoint.class })
@AutoConfiguration(after = SessionAutoConfiguration.class)
@ConditionalOnClass({ Session.class, SessionsEndpoint.class, ConditionalOnAvailableEndpoint.class })
@ConditionalOnAvailableEndpoint(SessionsEndpoint.class)
public class SessionsEndpointAutoConfiguration {
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/session/package-info.java → spring-boot-project/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/autoconfigure/package-info.java
+2 -2
View File
@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for actuator Spring Sessions concerns.
* Auto-configuration for Spring Session actuator endpoint.
*/
package org.springframework.boot.actuate.autoconfigure.session;
package org.springframework.boot.session.actuate.endpoint.autoconfigure;
spring-boot-project/spring-boot-session/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+1
View File
@@ -1 +1,2 @@
org.springframework.boot.session.actuate.endpoint.autoconfigure.SessionsEndpointAutoConfiguration
org.springframework.boot.session.autoconfigure.SessionAutoConfiguration
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java → spring-boot-project/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/autoconfigure/SessionsEndpointAutoConfigurationTests.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.actuate.autoconfigure.session;
package org.springframework.boot.session.actuate.endpoint.autoconfigure;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;