Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove actuate from restructured metrics package names

Browse Source
This commit is contained in:
Andy Wilkinson
2025-05-28 10:19:08 +01:00
committed by Phillip Webb
parent 8938c809a5
commit 0464bf753f
86 changed files with 130 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinder.java → spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinder.java
View File

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

4
spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java → spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.tomcat.actuate.metrics.autoconfigure;
package org.springframework.boot.tomcat.metrics.autoconfigure;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;
@@ -26,7 +26,7 @@ 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.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
import org.springframework.boot.tomcat.metrics.TomcatMetricsBinder;
import org.springframework.context.annotation.Bean;
/**

2
spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/package-info.java → spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Auto-configuration for Tomcat actuator metrics.
*/
package org.springframework.boot.tomcat.actuate.metrics.autoconfigure;
package org.springframework.boot.tomcat.metrics.autoconfigure;

2
spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/package-info.java → spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Tomcat metrics.
*/
package org.springframework.boot.tomcat.actuate.metrics;
package org.springframework.boot.tomcat.metrics;

2
spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1,5 +1,5 @@
org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatReactiveManagementContextAutoConfiguration
org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementContextAutoConfiguration
org.springframework.boot.tomcat.actuate.metrics.autoconfigure.TomcatMetricsAutoConfiguration
org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration
org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration
org.springframework.boot.tomcat.metrics.autoconfigure.TomcatMetricsAutoConfiguration

2
spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinderTests.java → spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinderTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.tomcat.actuate.metrics;
package org.springframework.boot.tomcat.metrics;
import io.micrometer.core.instrument.MeterRegistry;
import org.junit.jupiter.api.Test;

4
spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java → spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.tomcat.actuate.metrics.autoconfigure;
package org.springframework.boot.tomcat.metrics.autoconfigure;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
@@ -31,9 +31,9 @@ import org.springframework.boot.context.event.ApplicationStartedEvent;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.tomcat.TomcatWebServer;
import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
import org.springframework.boot.tomcat.metrics.TomcatMetricsBinder;
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;