Restructure autoconfigure packages

Restructure modules packages so that all auto-configuration is
organized under single top-level autoconfigure package.
This commit is contained in:
Phillip Webb
2025-06-11 16:29:17 -07:00
parent e60af6a8c7
commit 3de1e27b64
499 changed files with 1133 additions and 1464 deletions

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint.autoconfigure;
package org.springframework.boot.session.autoconfigure.endpoint;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
@@ -25,9 +25,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
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.boot.session.endpoint.ReactiveSessionsEndpoint;
import org.springframework.boot.session.endpoint.SessionsEndpoint;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.session.FindByIndexNameSessionRepository;

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2025 the original author or authors.
* Copyright 2012-2019 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.
@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for Spring Session actuator endpoint.
* Auto-configuration for Spring Session endpoint.
*/
package org.springframework.boot.session.actuate.endpoint.autoconfigure;
package org.springframework.boot.session.autoconfigure.endpoint;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import reactor.core.publisher.Mono;
@@ -22,7 +22,7 @@ import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.Selector;
import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.session.ReactiveFindByIndexNameSessionRepository;
import org.springframework.session.ReactiveSessionRepository;
import org.springframework.session.Session;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import java.time.Instant;
import java.util.List;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import java.util.Map;
@@ -22,7 +22,7 @@ import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.Selector;
import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.session.FindByIndexNameSessionRepository;
import org.springframework.session.Session;
import org.springframework.session.SessionRepository;

View File

@@ -17,4 +17,4 @@
/**
* Actuator endpoint for Spring Session.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;

View File

@@ -1,2 +1,2 @@
org.springframework.boot.session.actuate.endpoint.autoconfigure.SessionsEndpointAutoConfiguration
org.springframework.boot.session.autoconfigure.SessionAutoConfiguration
org.springframework.boot.session.autoconfigure.endpoint.SessionsEndpointAutoConfiguration

View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint.autoconfigure;
package org.springframework.boot.session.autoconfigure.endpoint;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.session.actuate.endpoint.ReactiveSessionsEndpoint;
import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint;
import org.springframework.boot.session.endpoint.ReactiveSessionsEndpoint;
import org.springframework.boot.session.endpoint.SessionsEndpoint;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.context.annotation.Bean;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import java.time.Duration;
import java.util.Collections;
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.session.MapSession;
import org.springframework.session.ReactiveFindByIndexNameSessionRepository;
import org.springframework.session.ReactiveSessionRepository;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import java.util.Collections;

View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
import org.springframework.session.FindByIndexNameSessionRepository;
import org.springframework.session.MapSession;
import org.springframework.session.Session;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.session.actuate.endpoint;
package org.springframework.boot.session.endpoint;
import java.util.Collections;