Restructure autoconfigure packages
Restructure modules packages so that all auto-configuration is organized under single top-level autoconfigure package.
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.actuate.endpoint.autoconfigure;
|
||||
package org.springframework.boot.integration.autoconfigure.endpoint;
|
||||
|
||||
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
@@ -22,8 +22,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint;
|
||||
import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
|
||||
import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor;
|
||||
import org.springframework.integration.graph.IntegrationGraphServer;
|
||||
@@ -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 Integration actuator endpoint.
|
||||
* Auto-configuration for Spring Integration endpoint.
|
||||
*/
|
||||
package org.springframework.boot.integration.actuate.endpoint.autoconfigure;
|
||||
package org.springframework.boot.integration.autoconfigure.endpoint;
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.metrics.autoconfigure;
|
||||
package org.springframework.boot.integration.autoconfigure.metrics;
|
||||
|
||||
import io.micrometer.core.instrument.MeterRegistry;
|
||||
|
||||
@@ -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.
|
||||
@@ -17,4 +17,4 @@
|
||||
/**
|
||||
* Auto-configuration for Spring Integration metrics.
|
||||
*/
|
||||
package org.springframework.boot.integration.metrics.autoconfigure;
|
||||
package org.springframework.boot.integration.autoconfigure.metrics;
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.actuate.endpoint;
|
||||
package org.springframework.boot.integration.endpoint;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
@@ -17,4 +17,4 @@
|
||||
/**
|
||||
* Actuator endpoint for Spring Integration.
|
||||
*/
|
||||
package org.springframework.boot.integration.actuate.endpoint;
|
||||
package org.springframework.boot.integration.endpoint;
|
||||
@@ -1,3 +1,3 @@
|
||||
org.springframework.boot.integration.actuate.endpoint.autoconfigure.IntegrationGraphEndpointAutoConfiguration
|
||||
org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration
|
||||
org.springframework.boot.integration.metrics.autoconfigure.IntegrationMetricsAutoConfiguration
|
||||
org.springframework.boot.integration.autoconfigure.endpoint.IntegrationGraphEndpointAutoConfiguration
|
||||
org.springframework.boot.integration.autoconfigure.metrics.IntegrationMetricsAutoConfiguration
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.actuate.endpoint.autoconfigure;
|
||||
package org.springframework.boot.integration.autoconfigure.endpoint;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
|
||||
import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint;
|
||||
import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
|
||||
import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint;
|
||||
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||
import org.springframework.integration.graph.IntegrationGraphServer;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.metrics.autoconfigure;
|
||||
package org.springframework.boot.integration.autoconfigure.metrics;
|
||||
|
||||
import io.micrometer.core.instrument.Gauge;
|
||||
import io.micrometer.core.instrument.MeterRegistry;
|
||||
@@ -22,8 +22,8 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||
import org.springframework.boot.integration.actuate.endpoint.autoconfigure.IntegrationGraphEndpointAutoConfiguration;
|
||||
import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
|
||||
import org.springframework.boot.integration.autoconfigure.endpoint.IntegrationGraphEndpointAutoConfiguration;
|
||||
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
|
||||
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.actuate.endpoint;
|
||||
package org.springframework.boot.integration.endpoint;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -23,7 +23,7 @@ import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint.GraphDescriptor;
|
||||
import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint.GraphDescriptor;
|
||||
import org.springframework.integration.graph.Graph;
|
||||
import org.springframework.integration.graph.IntegrationGraphServer;
|
||||
import org.springframework.integration.graph.IntegrationNode;
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.integration.actuate.endpoint;
|
||||
package org.springframework.boot.integration.endpoint;
|
||||
|
||||
import org.springframework.boot.actuate.endpoint.web.test.WebEndpointTest;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
Reference in New Issue
Block a user