diff --git a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/AbstractEndpointCondition.java b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/AbstractEndpointCondition.java index 11c2f51..dc25d78 100644 --- a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/AbstractEndpointCondition.java +++ b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/AbstractEndpointCondition.java @@ -16,10 +16,6 @@ package org.springframework.boot.actuate.autoconfigure.endpoint.condition; -import java.lang.annotation.Annotation; -import java.util.Map; -import java.util.Optional; - import org.springframework.boot.actuate.endpoint.EndpointId; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.EndpointExtension; @@ -39,6 +35,10 @@ import org.springframework.util.ClassUtils; import org.springframework.util.ConcurrentReferenceHashMap; +import java.lang.annotation.Annotation; +import java.util.Map; +import java.util.Optional; + /** * Base class for {@link Endpoint @Endpoint} related {@link SpringBootCondition} * implementations. diff --git a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java index adc7388..e4d5b6a 100644 --- a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java +++ b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java @@ -16,10 +16,6 @@ package org.springframework.boot.actuate.autoconfigure.endpoint.condition; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter; import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter.DefaultIncludes; import org.springframework.boot.actuate.endpoint.EndpointId; @@ -32,6 +28,10 @@ import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.util.ConcurrentReferenceHashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + /** * A condition that checks if an endpoint is available (i.e. enabled and exposed). * diff --git a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java index 8f6fcf5..03df597 100644 --- a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java +++ b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java @@ -16,14 +16,6 @@ package org.springframework.boot.actuate.autoconfigure.endpoint.expose; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - import org.springframework.boot.actuate.endpoint.EndpointFilter; import org.springframework.boot.actuate.endpoint.EndpointId; import org.springframework.boot.actuate.endpoint.ExposableEndpoint; @@ -32,6 +24,14 @@ import org.springframework.core.env.Environment; import org.springframework.util.Assert; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + /** * {@link EndpointFilter} that will filter endpoints based on {@code include} and * {@code exclude} patterns. diff --git a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java index da2e133..38e8725 100644 --- a/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java +++ b/microsphere-spring-boot-compatible/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java @@ -16,17 +16,16 @@ package org.springframework.boot.actuate.endpoint; -import java.util.HashSet; -import java.util.Locale; -import java.util.Set; -import java.util.regex.Pattern; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.core.env.Environment; import org.springframework.util.Assert; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; +import java.util.regex.Pattern; + /** * An identifier for an actuator endpoint. Endpoint IDs may contain only letters and * numbers. They must begin with a lower-case letter. Case and syntax characters are diff --git a/pom.xml b/pom.xml index 518bb57..3b6ab23 100644 --- a/pom.xml +++ b/pom.xml @@ -57,9 +57,9 @@ microsphere-spring-boot-parent microsphere-spring-boot-dependencies + microsphere-spring-boot-compatible microsphere-core-spring-boot-starter microsphere-spring-boot-actuator - microsphere-spring-boot-compatible