SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge core packages into one

Browse Source
This commit is contained in:
Dave Syer
2017-09-15 17:10:00 +01:00
parent dce30023e8
commit 3ccb925733
30 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java
View File

@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.function.context.FunctionInspector; 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.context.ConfigurableApplicationContext;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

6
spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/FunctionInitializer.java
View File

@@ -23,9 +23,9 @@ import java.util.function.Supplier;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.function.context.FunctionInspector; import org.springframework.cloud.function.context.FunctionInspector;
import org.springframework.cloud.function.registry.FunctionCatalog; import org.springframework.cloud.function.core.FluxFunction;
import org.springframework.cloud.function.support.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionCatalog;
import org.springframework.cloud.function.support.FluxFunction; import org.springframework.cloud.function.core.FunctionFactoryUtils;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractByteCodeLoadingProxy.java
View File

@@ -23,7 +23,7 @@ import org.springframework.asm.ClassReader;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.cloud.function.compiler.CompilationResultFactory; import org.springframework.cloud.function.compiler.CompilationResultFactory;
import org.springframework.cloud.function.compiler.java.SimpleClassLoader; 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.core.io.Resource;
import org.springframework.util.FileCopyUtils; import org.springframework.util.FileCopyUtils;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/AbstractLambdaCompilingProxy.java
View File

@@ -23,7 +23,7 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.cloud.function.compiler.AbstractFunctionCompiler; import org.springframework.cloud.function.compiler.AbstractFunctionCompiler;
import org.springframework.cloud.function.compiler.CompiledFunctionFactory; 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.core.io.Resource;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils; import org.springframework.util.FileCopyUtils;

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingConsumer.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler.proxy;
import java.util.function.Consumer; 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; import org.springframework.core.io.Resource;
/** /**

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunction.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler.proxy;
import java.util.function.Function; 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; import org.springframework.core.io.Resource;
/** /**

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingSupplier.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler.proxy;
import java.util.function.Supplier; 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; import org.springframework.core.io.Resource;
/** /**

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingFunction.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.function.compiler.proxy;
import java.util.function.Function; import java.util.function.Function;
import org.springframework.cloud.function.compiler.FunctionCompiler; 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; import org.springframework.core.io.Resource;
/** /**

2
spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/proxy/LambdaCompilingSupplier.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.function.compiler.proxy;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.springframework.cloud.function.compiler.SupplierCompiler; 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; import org.springframework.core.io.Resource;
/** /**

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java
View File

@@ -20,7 +20,7 @@ import java.util.function.Consumer;
import org.junit.Test; 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; import static org.assertj.core.api.Assertions.assertThat;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java
View File

@@ -20,7 +20,7 @@ import java.util.function.Function;
import org.junit.Test; 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; import static org.assertj.core.api.Assertions.assertThat;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java
View File

@@ -20,7 +20,7 @@ import java.util.function.Supplier;
import org.junit.Test; 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; import static org.assertj.core.api.Assertions.assertThat;

4
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java
View File

@@ -26,8 +26,8 @@ import org.springframework.cloud.function.compiler.CompiledFunctionFactory;
import org.springframework.cloud.function.compiler.ConsumerCompiler; import org.springframework.cloud.function.compiler.ConsumerCompiler;
import org.springframework.cloud.function.compiler.FunctionCompiler; import org.springframework.cloud.function.compiler.FunctionCompiler;
import org.springframework.cloud.function.compiler.SupplierCompiler; import org.springframework.cloud.function.compiler.SupplierCompiler;
import org.springframework.cloud.function.support.FunctionFactoryMetadata; import org.springframework.cloud.function.core.FunctionFactoryMetadata;
import org.springframework.cloud.function.support.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionFactoryUtils;
import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ByteArrayResource;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

12
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -47,12 +47,12 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.function.registry.FunctionCatalog; import org.springframework.cloud.function.core.FluxConsumer;
import org.springframework.cloud.function.support.FluxConsumer; import org.springframework.cloud.function.core.FluxFunction;
import org.springframework.cloud.function.support.FluxFunction; import org.springframework.cloud.function.core.FluxSupplier;
import org.springframework.cloud.function.support.FluxSupplier; import org.springframework.cloud.function.core.FunctionCatalog;
import org.springframework.cloud.function.support.FunctionFactoryMetadata; import org.springframework.cloud.function.core.FunctionFactoryMetadata;
import org.springframework.cloud.function.support.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionFactoryUtils;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionEntry.java
View File

@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import org.springframework.beans.factory.annotation.Qualifier; 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; import org.springframework.core.annotation.AliasFor;
/** /**

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/InMemoryFunctionCatalog.java
View File

@@ -24,7 +24,7 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Stream; 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.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

2
spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxConsumer.java → spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxConsumer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.support; package org.springframework.cloud.function.core;
import java.util.function.Consumer; import java.util.function.Consumer;

2
spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxFunction.java → spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxFunction.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.support; package org.springframework.cloud.function.core;
import java.util.function.Function; import java.util.function.Function;

2
spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FluxSupplier.java → spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FluxSupplier.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.support; package org.springframework.cloud.function.core;
import java.time.Duration; import java.time.Duration;
import java.util.function.Supplier; import java.util.function.Supplier;

2
spring-cloud-function-core/src/main/java/org/springframework/cloud/function/registry/FunctionCatalog.java → spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionCatalog.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.registry; package org.springframework.cloud.function.core;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;

2
spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryMetadata.java → spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryMetadata.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.support; package org.springframework.cloud.function.core;
import java.lang.reflect.Method; import java.lang.reflect.Method;

2
spring-cloud-function-core/src/main/java/org/springframework/cloud/function/support/FunctionFactoryUtils.java → spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionFactoryUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.support; package org.springframework.cloud.function.core;
import java.lang.invoke.SerializedLambda; import java.lang.invoke.SerializedLambda;
import java.lang.reflect.Method; import java.lang.reflect.Method;

4
spring-cloud-function-core/src/test/java/org/springframework/cloud/function/support/FunctionFactoryUtilsTests.java → spring-cloud-function-core/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cloud.function.support; package org.springframework.cloud.function.core;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
import org.junit.Test; import org.junit.Test;
import org.springframework.cloud.function.support.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionFactoryUtils;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

2
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalog.java
View File

@@ -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.spi.core.AppDeploymentRequest;
import org.springframework.cloud.deployer.thin.ThinJarAppDeployer; import org.springframework.cloud.deployer.thin.ThinJarAppDeployer;
import org.springframework.cloud.function.context.FunctionInspector; 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.context.support.LiveBeansView;
import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;

2
spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java
View File

@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.function.context.FunctionInspector; 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.annotation.EnableBinding;
import org.springframework.cloud.stream.binder.Binder; import org.springframework.cloud.stream.binder.Binder;
import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory; import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory;

2
spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java
View File

@@ -27,7 +27,7 @@ import java.util.function.Function;
import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.cloud.function.context.FunctionInspector; 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.Input;
import org.springframework.cloud.stream.annotation.Output; import org.springframework.cloud.stream.annotation.Output;
import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.cloud.stream.annotation.StreamListener;

2
spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/SupplierInvokingMessageProducer.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.stream;
import java.util.function.Supplier; 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.cloud.stream.messaging.Source;
import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.endpoint.MessageProducerSupport;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;

2
spring-cloud-function-task/src/main/java/org/springframework/cloud/function/task/TaskConfiguration.java
View File

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner; import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties; 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.cloud.task.configuration.EnableTask;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java
View File

@@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.cloud.function.context.FunctionInspector; 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.cloud.function.web.flux.constants.WebRequestConstants;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
View File

@@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.HttpMessageConverters; import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
import org.springframework.cloud.function.context.FunctionInspector; 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.request.FluxHandlerMethodArgumentResolver;
import org.springframework.cloud.function.web.flux.response.FluxReturnValueHandler; import org.springframework.cloud.function.web.flux.response.FluxReturnValueHandler;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;