From 0ccf84671f94712bfb76ae3ec54edaf287bec717 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 30 Nov 2021 19:06:18 +0100 Subject: [PATCH] GH-766 Polishing, check-styles, package name change --- .../function/{endpoint => actuator}/FunctionsEndpoint.java | 6 ++---- .../context/config/FunctionsEndpointAutoConfiguration.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) rename spring-cloud-function-context/src/main/java/org/springframework/cloud/function/{endpoint => actuator}/FunctionsEndpoint.java (93%) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/endpoint/FunctionsEndpoint.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/actuator/FunctionsEndpoint.java similarity index 93% rename from spring-cloud-function-context/src/main/java/org/springframework/cloud/function/endpoint/FunctionsEndpoint.java rename to spring-cloud-function-context/src/main/java/org/springframework/cloud/function/actuator/FunctionsEndpoint.java index c27820e6e..69135d46c 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/endpoint/FunctionsEndpoint.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/actuator/FunctionsEndpoint.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.cloud.function.endpoint; +package org.springframework.cloud.function.actuator; import java.util.LinkedHashMap; - import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -26,11 +25,10 @@ import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; -import org.springframework.cloud.function.json.JsonMapper; /** * - * Actuator endpoint to access {@link FunctionCatalog} + * Actuator endpoint to access {@link FunctionCatalog}. * * @author Oleg Zhurakousky * @since 3.2 diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionsEndpointAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionsEndpointAutoConfiguration.java index 912f5f2b9..d86929863 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionsEndpointAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionsEndpointAutoConfiguration.java @@ -21,8 +21,8 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.condition.Conditi import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.cloud.function.actuator.FunctionsEndpoint; import org.springframework.cloud.function.context.FunctionCatalog; -import org.springframework.cloud.function.endpoint.FunctionsEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;