diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java index a1418e879..4bc602039 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.ClassUtils; diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/FunctionInitializer.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/FunctionInitializer.java index 68866ef86..510b39e03 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/FunctionInitializer.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/FunctionInitializer.java @@ -23,9 +23,9 @@ import java.util.function.Supplier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; -import org.springframework.cloud.function.support.FunctionFactoryUtils; -import org.springframework.cloud.function.support.FluxFunction; +import org.springframework.cloud.function.core.FluxFunction; +import org.springframework.cloud.function.core.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import reactor.core.publisher.Flux; diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java index 4c6641277..57e31a908 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java @@ -23,7 +23,7 @@ import org.springframework.asm.ClassReader; import org.springframework.beans.factory.InitializingBean; import org.springframework.cloud.function.compiler.CompilationResultFactory; import org.springframework.cloud.function.compiler.java.SimpleClassLoader; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; import org.springframework.util.FileCopyUtils; import org.springframework.util.ReflectionUtils; diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java index 285a2639a..532209fd1 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.cloud.function.compiler.AbstractFunctionCompiler; import org.springframework.cloud.function.compiler.CompiledFunctionFactory; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java index 3d682cb10..3728902bb 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler.proxy; import java.util.function.Consumer; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; /** diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java index c730b7cc0..cb3643759 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler.proxy; import java.util.function.Function; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; /** diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java index ce05223bd..70a72e1cb 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler.proxy; import java.util.function.Supplier; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; /** diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java index 711c8c193..d377a5b59 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java @@ -19,7 +19,7 @@ package org.springframework.cloud.function.compiler.proxy; import java.util.function.Function; import org.springframework.cloud.function.compiler.FunctionCompiler; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; /** diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java index ef08d8464..97c48dbcb 100644 --- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java +++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java @@ -19,7 +19,7 @@ package org.springframework.cloud.function.compiler.proxy; import java.util.function.Supplier; import org.springframework.cloud.function.compiler.SupplierCompiler; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; import org.springframework.core.io.Resource; /** diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java index 2bfe96f9e..9944020ea 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java @@ -20,7 +20,7 @@ import java.util.function.Consumer; import org.junit.Test; -import org.springframework.cloud.function.support.FunctionFactoryUtils; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java index 01823c63f..2b5251753 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.junit.Test; -import org.springframework.cloud.function.support.FunctionFactoryUtils; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java index 45f8d8155..aefbc0e34 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java @@ -20,7 +20,7 @@ import java.util.function.Supplier; import org.junit.Test; -import org.springframework.cloud.function.support.FunctionFactoryUtils; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java index 9ff41f9a3..522bafc79 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java @@ -26,8 +26,8 @@ import org.springframework.cloud.function.compiler.CompiledFunctionFactory; import org.springframework.cloud.function.compiler.ConsumerCompiler; import org.springframework.cloud.function.compiler.FunctionCompiler; import org.springframework.cloud.function.compiler.SupplierCompiler; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; -import org.springframework.cloud.function.support.FunctionFactoryUtils; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import org.springframework.core.io.ByteArrayResource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java index b16c38a5c..b8af779d0 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java @@ -47,12 +47,12 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.function.registry.FunctionCatalog; -import org.springframework.cloud.function.support.FluxConsumer; -import org.springframework.cloud.function.support.FluxFunction; -import org.springframework.cloud.function.support.FluxSupplier; -import org.springframework.cloud.function.support.FunctionFactoryMetadata; -import org.springframework.cloud.function.support.FunctionFactoryUtils; +import org.springframework.cloud.function.core.FluxConsumer; +import org.springframework.cloud.function.core.FluxFunction; +import org.springframework.cloud.function.core.FluxSupplier; +import org.springframework.cloud.function.core.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionFactoryMetadata; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.ResolvableType; diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionEntry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionEntry.java index 44acc3306..f5eace814 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionEntry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionEntry.java @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.core.annotation.AliasFor; /** diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/InMemoryFunctionCatalog.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/InMemoryFunctionCatalog.java index 0d3efb15e..d8e154884 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/InMemoryFunctionCatalog.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/InMemoryFunctionCatalog.java @@ -24,7 +24,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Stream; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxConsumer.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java similarity index 95% rename from spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxConsumer.java rename to spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java index ac8b5c300..6c47f0fb6 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxConsumer.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.support; +package org.springframework.cloud.function.core; import java.util.function.Consumer; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxFunction.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java similarity index 96% rename from spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxFunction.java rename to spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java index 96c6f1576..fe5c53212 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxFunction.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.support; +package org.springframework.cloud.function.core; import java.util.function.Function; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxSupplier.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java similarity index 97% rename from spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxSupplier.java rename to spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java index 07aa3205a..6a843ae00 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxSupplier.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.support; +package org.springframework.cloud.function.core; import java.time.Duration; import java.util.function.Supplier; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/registry/FunctionCatalog.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionCatalog.java similarity index 95% rename from spring-cloud-function-core/src/main/java/org/springframework/cloud/function/registry/FunctionCatalog.java rename to spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionCatalog.java index 7816ff5c3..2d973fb56 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/registry/FunctionCatalog.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionCatalog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.registry; +package org.springframework.cloud.function.core; import java.util.Collections; import java.util.Set; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryMetadata.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java similarity index 93% rename from spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryMetadata.java rename to spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java index c32e56335..08b04c4af 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryMetadata.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.support; +package org.springframework.cloud.function.core; import java.lang.reflect.Method; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryUtils.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java similarity index 98% rename from spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryUtils.java rename to spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java index b27f80c69..b07e52dfe 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryUtils.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.support; +package org.springframework.cloud.function.core; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Method; diff --git a/spring-cloud-function-core/src/test/java/org/springframework/cloud/function/support/FunctionFactoryUtilsTests.java b/spring-cloud-function-core/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java similarity index 94% rename from spring-cloud-function-core/src/test/java/org/springframework/cloud/function/support/FunctionFactoryUtilsTests.java rename to spring-cloud-function-core/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java index 29eb70817..66e48f578 100644 --- a/spring-cloud-function-core/src/test/java/org/springframework/cloud/function/support/FunctionFactoryUtilsTests.java +++ b/spring-cloud-function-core/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.support; +package org.springframework.cloud.function.core; import java.lang.reflect.Method; import java.util.function.Consumer; @@ -23,7 +23,7 @@ import java.util.function.Supplier; import org.junit.Test; -import org.springframework.cloud.function.support.FunctionFactoryUtils; +import org.springframework.cloud.function.core.FunctionFactoryUtils; import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalog.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalog.java index 41f5df27d..d226900c9 100644 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalog.java +++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalog.java @@ -37,7 +37,7 @@ import org.springframework.cloud.deployer.spi.core.AppDefinition; import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest; import org.springframework.cloud.deployer.thin.ThinJarAppDeployer; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.context.support.LiveBeansView; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java index bae8c9f9f..75643842b 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.binder.Binder; import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory; diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java index e318c9500..309163b64 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java @@ -27,7 +27,7 @@ import java.util.function.Function; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.cloud.stream.annotation.Input; import org.springframework.cloud.stream.annotation.Output; import org.springframework.cloud.stream.annotation.StreamListener; diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/SupplierInvokingMessageProducer.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/SupplierInvokingMessageProducer.java index a03d4ce20..2dc26286c 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/SupplierInvokingMessageProducer.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/SupplierInvokingMessageProducer.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.stream; import java.util.function.Supplier; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.cloud.stream.messaging.Source; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.messaging.Message; diff --git a/spring-cloud-function-task/src/main/java/org/springframework/cloud/function/task/TaskConfiguration.java b/spring-cloud-function-task/src/main/java/org/springframework/cloud/function/task/TaskConfiguration.java index 1ec7db59b..bde5c2d0d 100644 --- a/spring-cloud-function-task/src/main/java/org/springframework/cloud/function/task/TaskConfiguration.java +++ b/spring-cloud-function-task/src/main/java/org/springframework/cloud/function/task/TaskConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java index 1b0d75b2d..1a8440906 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.cloud.function.web.flux.constants.WebRequestConstants; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java index 82ed9cb23..22ce38bf2 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.web.HttpMessageConverters; import org.springframework.cloud.function.context.FunctionInspector; -import org.springframework.cloud.function.registry.FunctionCatalog; +import org.springframework.cloud.function.core.FunctionCatalog; import org.springframework.cloud.function.web.flux.request.FluxHandlerMethodArgumentResolver; import org.springframework.cloud.function.web.flux.response.FluxReturnValueHandler; import org.springframework.context.ApplicationContext;