Merge pull request #99 from fnproject/angie-javaex-gradle

Update Java FDK gradle-build example to latest code

Author: angelica-viorato

fdks/fdk-java/examples/gradle-build/Dockerfile

@@ -1,4 +1,5 @@
-FROM gradle:4.5.1-jdk8 as build-stage
+FROM gradle:5.6.2-jdk11 as build-stage
+
 WORKDIR /function
 # needed for gradle?
 USER root
@@ -14,7 +15,7 @@ COPY src /function/src
 
 RUN ["gradle", "-s", "--no-daemon","--console","plain","build"]
 # Container build
-FROM fnproject/fn-java-fdk:1.0.56
+FROM fnproject/fn-java-fdk:jre11-1.0.98
 WORKDIR /function
 COPY --from=build-stage /function/build/libs/*.jar /function/build/deps/*.jar /function/app/
 CMD ["com.example.fn.HelloFunction::handleRequest"]

fdks/fdk-java/examples/gradle-build/README.md

@@ -1,14 +1,41 @@
-# Fn Gradle + Java fdk example 
+# Example Java Functions: Fn Gradle + Java fdk  
 
-Fn uses Maven by default for  builds. This is an example that uses Fn's `docker` runtime format to build a Java function using the [Fn Java FDK](https://github.com/fnproject/fdk-java).
+This example shows you how to build a Java function by using a Dockerfile.
 
-The example consists of a `Dockerfile` that builds the function using gradle and copies the function's dependencies to `build/deps` and a func.yaml that uses that `Dockerfile` to build the function.
 
-Note that fdk.versions are hard-coded in this example, you may need to update them manually to more recent version. 
+## Key points:
 
-Key points:
+* [Dockerfile](Dockerfile) - contains the containerized Docker build (based on dockerhub library/gradle images) and image build - this includes the gradle invocation
+* The `cacheDeps` task in `build.gradle` pulls down dependencies into the container gradle cache to speed up docker builds. 
+* The `copyDeps` task in `build.gradle` copies the functions compile deps.
+* This uses JDK 11 by default
 
-* [Dockerfile](Dockerfile) - contains the containerised docker build (based on dockerhub library/gradle images) and image build - this includes the gradle invocation
-* The `cacheDeps` task in `build.gradle` is invoked within the Dockerfile - The task pulls down dependencies into the container gradle cache to speed up docker builds. 
-* The `copyDeps` task in `build.gradle` copies the functions compile deps 
-* This uses JDK 8 by default  - you can change this to Java 11 by changing :  `FROM gradle:4.5.1-jdk8 as build-stage` to `FROM gradle:4.5.1-jre11 as build-stage` and  `FROM fnproject/fn-java-fdk:1.0.85` to `FROM fnproject/fn-java-fdk:jre11-1.0.85` 
+## Step by step
+
+Ensure you have the Fn server running to host your function:
+
+(1) Start the server
+
+```sh
+$ fn start
+```
+
+(2) Create an app for the function
+
+```sh
+$ fn create app gradle-build-app
+```
+
+(3) Deploy the function to your app from the `gradle-build` directory.
+
+```sh
+fn deploy --app gradle-build-app --local
+```
+
+(4) Invoke the function 
+
+```sh
+fn invoke gradle-build-app gradle_build
+```
+
+ 

fdks/fdk-java/examples/gradle-build/build.gradle

@@ -1,29 +1,31 @@
 apply plugin: 'java'
 
 ext {
-   fdkVersion = '1.0.56'
+   fdkVersion = '1.0.98'
 }
 
 repositories {
     mavenCentral()
     maven {
         url 'https://dl.bintray.com/fnproject/fnproject'
-    }
+    }                
 }
 
 dependencies {
     runtime "com.fnproject.fn:api:$fdkVersion"
     // runtime "com.fnproject.fn:runtime:$fdkVersion" // this is optional and included with its deps in the base image to reduce layer size
 
     testCompile "junit:junit:4.12"
-    testCompile "com.fnproject.fn:testing:$fdkVersion"
+    testCompile "com.fnproject.fn:testing-core:$fdkVersion"
+    testCompile "com.fnproject.fn:testing-junit4:$fdkVersion"    
 }
 
 task cacheDeps(type: Exec) {
-    configurations.testRuntime.files
+    configurations.testCompile.files
     commandLine 'echo', 'Downloaded all dependencies'
 }
 
+
 task copyDeps(type: Copy) {
   from configurations.compile
   into "${project.buildDir}/deps"

fdks/fdk-java/examples/gradle-build/func.yaml

@@ -1,4 +1,4 @@
+schema_version: 20180708
 name: gradle_build
-version: 0.0.3
+version: 0.0.41
 runtime: docker
-format: http

fdks/fdk-java/examples/gradle-build/src/test/java/com/example/fn/HelloFunctionTest.java

@@ -2,6 +2,14 @@
 
 import static org.junit.Assert.*;
 
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.fnproject.fn.testing.FnResult;
+import com.fnproject.fn.testing.FnTestingRule;
+
+
+
 public class HelloFunctionTest {
 
     @Rule