diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index 942ae7387..83f1867dc 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -89,6 +89,8 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(Supplier.class))); registeredNames .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(Consumer.class))); + registeredNames + .addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(FunctionRegistration.class))); } else { registeredNames.addAll(Arrays.asList(this.applicationContext.getBeanNamesForType(type))); diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/.jdk8 b/spring-cloud-function-samples/function-sample-functional-aws-routing/.jdk8 new file mode 100644 index 000000000..e69de29bb diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/README.adoc b/spring-cloud-function-samples/function-sample-functional-aws-routing/README.adoc new file mode 100644 index 000000000..fc0c41a2c --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/README.adoc @@ -0,0 +1,7 @@ +This example demonstrates routing capabilities of spring-cloud-function when deployed as AWS Lambdas. +It is almost identical to the `function-sample-aws-routing` , so most of what's described it its README applies to this example as well. + +The main difference though is that this example uses functional bean definition feature of Spring. + +It also uses `MessageRoutingCallback` in place of `spring_cloud_function_definition` and/or `spring_cloud_function_routingExpression`, effectively giving you more flexibility with your routing decisions. + diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/build.gradle b/spring-cloud-function-samples/function-sample-functional-aws-routing/build.gradle new file mode 100644 index 000000000..a641c315f --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/build.gradle @@ -0,0 +1,93 @@ +buildscript { + ext { + springBootVersion = '2.2.0.BUILD-SNAPSHOT' + wrapperVersion = '1.0.17.RELEASE' + shadowVersion = '5.1.0' + } + repositories { + mavenLocal() + jcenter() + mavenCentral() + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:${shadowVersion}" + classpath("org.springframework.boot.experimental:spring-boot-thin-gradle-plugin:${wrapperVersion}") + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + classpath("io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE") + } +} + +apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'eclipse' +apply plugin: 'com.github.johnrengelman.shadow' +apply plugin: 'org.springframework.boot' +apply plugin: 'org.springframework.boot.experimental.thin-launcher' +apply plugin: 'io.spring.dependency-management' + +group = 'io.spring.sample' +version = '2.0.0.RELEASE' +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +repositories { + mavenLocal() + mavenCentral() + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } +} + +ext { + springCloudFunctionVersion = "3.0.0.BUILD-SNAPSHOT" + awsLambdaEventsVersion = "2.0.2" + awsLambdaCoreVersion = "1.1.0" +} +ext['reactor.version'] = "3.1.7.RELEASE" + +assemble.dependsOn = [shadowJar, thinJar] + +jar { + manifest { + attributes 'Main-Class': 'example.Config' + } +} + +import com.github.jengelman.gradle.plugins.shadow.transformers.* + +shadowJar { + classifier = 'aws' + dependencies { + exclude( + dependency("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}")) + } + // Required for Spring + mergeServiceFiles() + append 'META-INF/spring.handlers' + append 'META-INF/spring.schemas' + append 'META-INF/spring.tooling' + transform(PropertiesFileTransformer) { + paths = ['META-INF/spring.factories'] + mergeStrategy = "append" + } +} + +configurations { + testCompile.extendsFrom(compileOnly) +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" + } +} + +dependencies { + compile("org.springframework.cloud:spring-cloud-function-adapter-aws") + compile("org.springframework.cloud:spring-cloud-starter-function-webflux") + compile("org.springframework.boot:spring-boot-configuration-processor") + compileOnly("com.amazonaws:aws-lambda-java-events:${awsLambdaEventsVersion}") + compileOnly("com.amazonaws:aws-lambda-java-core:${awsLambdaCoreVersion}") + testCompile('org.springframework.boot:spring-boot-starter-test') +} diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..ca78035ef Binary files /dev/null and b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..b33419dee --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/gradlew b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradlew new file mode 100755 index 000000000..27309d923 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/gradlew.bat b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradlew.bat new file mode 100644 index 000000000..f6d5974e7 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml new file mode 100644 index 000000000..be0aab22c --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml @@ -0,0 +1,150 @@ + + + 4.0.0 + + io.spring.sample + function-sample-functional-aws-routing + 2.0.0.RELEASE + jar + + function-sample-functional-aws-routing + Spring Cloud Function Sample for AWS Lambda + + + org.springframework.boot + spring-boot-starter-parent + 2.6.0-SNAPSHOT + + + + + UTF-8 + UTF-8 + 1.8 + 1.0.27.RELEASE + 2.0.2 + 3.2.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-function-adapter-aws + + + org.springframework.cloud + spring-cloud-function-web + + + org.springframework.boot + spring-boot-starter-web + + + + com.amazonaws + aws-lambda-java-events + ${aws-lambda-events.version} + + + com.amazonaws + aws-lambda-java-core + 1.1.0 + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud-function.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.boot.experimental + spring-boot-thin-layout + ${wrapper.version} + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + false + true + aws + + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java new file mode 100644 index 000000000..9aa1eea0c --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/java/example/FunctionConfiguration.java @@ -0,0 +1,59 @@ +package example; + +import java.util.function.Function; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.function.context.FunctionRegistration; +import org.springframework.cloud.function.context.FunctionType; +import org.springframework.cloud.function.context.MessageRoutingCallback; +import org.springframework.cloud.function.context.MessageRoutingCallback.FunctionRoutingResult; +import org.springframework.cloud.function.json.JsonMapper; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.messaging.Message; + +@SpringBootApplication +public class FunctionConfiguration implements ApplicationContextInitializer { + + /* + * You need this main method or explicit example.FunctionConfiguration + * in the POM to ensure boot plug-in makes the correct entry + */ + public static void main(String[] args) { + SpringApplication.run(FunctionConfiguration.class, args); + } + + public Function uppercase() { + return value -> value.toUpperCase(); + } + + public Function reverse() { + return value -> new StringBuilder(value).reverse().toString(); + } + + public static class RoutingCallback implements MessageRoutingCallback { + @Override + public FunctionRoutingResult routingResult(Message message) { + String payload = new String((byte[]) message.getPayload()); + System.out.println("==> Will be routing based on payload: " + payload); + return payload.contains("uppercase") + ? new FunctionRoutingResult("uppercase") + : new FunctionRoutingResult("reverse"); + } + } + + @Override + public void initialize(GenericApplicationContext applicationContext) { + System.out.println("==> Initializing"); + applicationContext.registerBean(MessageRoutingCallback.class, + () -> new RoutingCallback()); + applicationContext.registerBean("uppercase", FunctionRegistration.class, + () -> new FunctionRegistration<>(uppercase()).type( + FunctionType.from(String.class).to(String.class))); + applicationContext.registerBean("reverse", FunctionRegistration.class, + () -> new FunctionRegistration<>(reverse()).type( + FunctionType.from(String.class).to(String.class))); + } +} diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/resources/application.properties new file mode 100644 index 000000000..eed9c5e95 --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/resources/application.properties @@ -0,0 +1,2 @@ +logging.level.org.springframework.cloud=DEBUG +spring.functional.enabled = false diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/resources/log4j.properties b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/resources/log4j.properties new file mode 100644 index 000000000..f644d953c --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/main/resources/log4j.properties @@ -0,0 +1,20 @@ +log4j.rootCategory=DEBUG, LAMBDA +PID=???? +LOG_LEVEL_PATTERN=%5p +LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${PID} ${LOG_LEVEL_PATTERN} [%t] --- %c{1}: %m%n +# CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.LAMBDA=com.amazonaws.services.lambda.runtime.log4j.LambdaAppender +log4j.appender.LAMBDA.layout=org.apache.log4j.PatternLayout +log4j.appender.LAMBDA.layout.conversionPattern=${LOG_PATTERN} +log4j.category.org.apache.catalina.startup.DigesterFactory=ERROR +log4j.category.org.apache.catalina.util.LifecycleBase=ERROR +log4j.category.org.apache.coyote.http11.Http11NioProtocol=WARN +log4j.category.org.apache.sshd.common.util.SecurityUtils +log4j.category.org.apache.tomcat.util.net.NioSelectorPool=WARN +log4j.category.org.crsh.plugin=WARN +log4j.category.org.crsh.ssh=WARN +log4j.category.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR +log4j.category.org.hibernate.validator.internal.util.Version=WARN +log4j.category.org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration=WARN +log4j.category.org.springframework.boot.actuate.endpoint.jmx=WARN +log4j.category.org.thymeleaf=WARN diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/src/test/java/example/MapTests.java b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/test/java/example/MapTests.java new file mode 100644 index 000000000..289a8c9ff --- /dev/null +++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/src/test/java/example/MapTests.java @@ -0,0 +1,31 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example; + +import org.junit.jupiter.api.Test; + +/** + * @author Dave Syer + * + */ +public class MapTests { + + @Test + public void test() { + + } +}