[e2e/java] Update function tests to test Spring support (#411)

Author: tenczar

e2e/tests/functions.bats

@@ -84,7 +84,7 @@ load variables
     echo_to_log
     assert_success
 
-    run_with_retry "dispatch get function java-hello-no-schema --json | jq -r .status" "READY" 8 5
+    run_with_retry "dispatch get function java-hello-no-schema --json | jq -r .status" "READY" 20 5
 }
 
 @test "Execute java function no schema" {
@@ -94,7 +94,7 @@ load variables
 @test "Create java function with runtime deps" {
     run dispatch create image java8-with-deps java8-base --runtime-deps ${DISPATCH_ROOT}/examples/java8/pom.xml
     assert_success
-    run_with_retry "dispatch get image java8-with-deps --json | jq -r .status" "READY" 10 5
+    run_with_retry "dispatch get image java8-with-deps --json | jq -r .status" "READY" 20 5
 
     run dispatch create function java8-with-deps java-hello-with-deps ${DISPATCH_ROOT}/examples/java8/HelloWithDeps.java
     echo_to_log
@@ -112,13 +112,30 @@ load variables
     echo_to_log
     assert_success
 
-    run_with_retry "dispatch get function java-hello-with-classes --json | jq -r .status" "READY" 8 5
+    run_with_retry "dispatch get function java-hello-with-classes --json | jq -r .status" "READY" 20 5
 }
 
 @test "Execute java with classes" {
     run_with_retry "dispatch exec java-hello-with-classes --input='{\"name\": \"Jon\", \"place\": \"Winterfell\"}' --wait --json | jq -r .output.myField" "Hello, Jon from Winterfell" 5 5
 }
 
+@test "Create java function with spring support" {
+    run dispatch create image java8-spring java8-base --runtime-deps ${DISPATCH_ROOT}/examples/java8/spring-pom.xml
+    assert_success
+
+    run_with_retry "dispatch get image java8-spring --json | jq -r .status" "READY" 10 5
+
+    run dispatch create function java8-spring spring-fn ${DISPATCH_ROOT}/examples/java8/HelloSpring.java
+    echo_to_log
+    assert_success
+
+    run_with_retry "dispatch get function spring-fn --json | jq -r .status" "READY" 20 5
+}
+
+@test "Execute java with spring support" {
+    run_with_retry "dispatch exec spring-fn --input='{\"name\":\"Jon\", \"place\":\"Winterfell\"}' --wait --json | jq -r .output.myField" "Hello, Jon from Winterfell" 5 5
+}
+
 @test "Create node function with schema" {
     run dispatch create function nodejs6 node-hello-with-schema ${DISPATCH_ROOT}/examples/nodejs6/hello.js --schema-in ${DISPATCH_ROOT}/examples/nodejs6/hello.schema.in.json --schema-out ${DISPATCH_ROOT}/examples/nodejs6/hello.schema.out.json
     echo_to_log

e2e/tests/images.yaml

@@ -24,7 +24,7 @@ tags:
 ---
 kind: BaseImage
 name: java8-base
-dockerUrl: dispatchframework/java8-base:0.0.2
+dockerUrl: dispatchframework/java8-base:0.0.3
 language: java8
 tags:
   - key: role

examples/java8/HelloSpring.java

@@ -0,0 +1,75 @@
+///////////////////////////////////////////////////////////////////////
+// Copyright (c) 2018 VMware, Inc. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+///////////////////////////////////////////////////////////////////////
+package io.dispatchframework.examples;
+
+import java.util.Map;
+import java.util.function.BiFunction;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * A simple example of using Dispatch with a Java function backed by a
+ * Spring ApplicationContext.
+ */
+@Configuration
+public class HelloSpring {
+
+
+    @Bean(name = "noone")
+    Person noone() {
+        return new Person("Noone", "Nowhere");
+    }
+
+    @Bean
+    HelloSpringFunction function(@Qualifier("noone") Person noone) {
+        return new HelloSpringFunction(noone);
+    }
+
+    public class HelloSpringFunction implements BiFunction<Map<Object, Object>, Person, Result> {
+        private Person defaultPerson;
+
+        HelloSpringFunction(Person defaultPerson) {
+            this.defaultPerson = defaultPerson;
+        }
+
+        @Override
+        public Result apply(Map<Object, Object> context, Person person) {
+        	final String name = person.getName() == null ? defaultPerson.getName() : person.getName();
+        	final String place = person.getPlace() == null ? defaultPerson.getPlace() : person.getPlace();
+            return new Result("Hello, " + name + " from " + place);
+        }
+    }
+
+    private class Person {
+    	private String name;
+    	private String place;
+
+    	public Person(String name, String place) {
+    		this.name = name;
+    		this.place = place;
+    	}
+
+    	public String getName() {
+    		return this.name;
+    	}
+
+    	public String getPlace() {
+    		return this.place;
+    	}
+    }
+
+    private class Result {
+    	private String myField;
+
+    	public Result(String myField) {
+    		this.myField = myField;
+    	}
+
+    	public String getMyField() {
+    		return this.myField;
+    	}
+    }
+}

examples/java8/pom.xml

@@ -1,4 +1,6 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dispatchframework.examples</groupId>
     <artifactId>hello-with-deps</artifactId>

examples/java8/spring-pom.xml

@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>dispatchframework.examples</groupId>
+  <artifactId>dispatch-spring</artifactId>
+  <version>1.0.0</version>
+
+  <properties>
+    <spring.version>5.0.5.RELEASE</spring.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+  </dependencies>
+</project>