Merge pull request #82 from fnproject/mww-190614-jfdk-regex

Update Java fdk Regex example to latest code. Checked with Angie. Merging.

Author: michael-w-williams

.gitignore

@@ -0,0 +1 @@
+target/

fdks/fdk-java/examples/regex-query/README.md

@@ -3,7 +3,7 @@
 This example provides an HTTP endpoint for performing regex matching on strings.
 
 ```bash
-$ curl -d '{ "text": "One, 2, Three, 4, Five", "regex": "\\\\d" }' 'http://localhost:8080/r/regex-query/query'
+$ curl -d '{"text":"One, 2, Three, 4, Five", "regex":"\\d"}' 'http://localhost:8080/t/regex-query/query'
 {"regex":"\\d","text":"One, 2, Three, 4, Five","matches":[{"start":5,"end":6,"match":"2"},{"start":15,"end":16,"match":"4"}]}
 ```
 
@@ -34,7 +34,7 @@ Create an app and route to host the function
 
 ```bash
 $ fn create app regex-query
-$ fn create route regex-query /query
+$ fn --verbose deploy --app regex-query --local
 ```
 
 Invoke the function to perform a regex search
@@ -48,7 +48,7 @@ $ curl -d '{ "text": "One, 2, Three, 4, Five", "regex": "\\\\d" }' 'http://local
 ## Code walkthrough
 
 The entrypoint to the function is specified in `func.yaml` in the `cmd` key.
-This is set to be `com.fnproject.fn.examples.RegexQuery::query`. The class
+This is set to be `com.example.fn.RegexQuery::query`. The class
 containing the function is shown below:
 
 

fdks/fdk-java/examples/regex-query/func.yaml

@@ -1,7 +1,12 @@
-name: fn-example/regex-query
-version: 0.0.1
+schema_version: 20180708
+name: query
+version: 0.0.4
 runtime: java
-timeout: 30
-format: http
-cmd: com.fnproject.fn.examples.RegexQuery::query
-path: /query
+build_image: fnproject/fn-java-fdk-build:jdk11-1.0.96
+run_image: fnproject/fn-java-fdk:jre11-1.0.96
+cmd: com.example.fn.RegexQuery::query
+triggers:
+- name: query
+  type: http
+  source: /query
+  

fdks/fdk-java/examples/regex-query/pom.xml

@@ -7,14 +7,14 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <fdk.version>1.0.0-SNAPSHOT</fdk.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <fdk.version>1.0.96</fdk.version>
         <jackson.version>2.9.9</jackson.version>
     </properties>
 
-    <groupId>com.fnproject.fn.examples</groupId>
+    <groupId>com.example.fn</groupId>
     <artifactId>regex-query</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <dependencies>
         <dependency>
@@ -33,6 +33,11 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fnproject.fn</groupId>
+            <artifactId>api</artifactId>
+            <version>${fdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.fnproject.fn</groupId>
             <artifactId>testing-core</artifactId>
@@ -53,6 +58,7 @@
         </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <plugin>
@@ -77,8 +83,16 @@
 
     <repositories>
         <repository>
-            <id>fn-maven-releases</id>
+            <id>fn-release-repo</id>
             <url>https://dl.bintray.com/fnproject/fnproject</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>
+
+
 </project>

fdks/fdk-java/examples/regex-query/src/main/java/com/fnproject/fn/examples/Match.java renamed to fdks/fdk-java/examples/regex-query/src/main/java/com/example/fn/Match.java

@@ -1,4 +1,4 @@
-package com.fnproject.fn.examples;
+package com.example.fn;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

fdks/fdk-java/examples/regex-query/src/main/java/com/fnproject/fn/examples/Query.java renamed to fdks/fdk-java/examples/regex-query/src/main/java/com/example/fn/Query.java

@@ -1,4 +1,4 @@
-package com.fnproject.fn.examples;
+package com.example.fn;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

fdks/fdk-java/examples/regex-query/src/main/java/com/fnproject/fn/examples/RegexQuery.java renamed to fdks/fdk-java/examples/regex-query/src/main/java/com/example/fn/RegexQuery.java

@@ -1,11 +1,12 @@
-package com.fnproject.fn.examples;
+package com.example.fn;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class RegexQuery {
+       
     public Response query(Query query) {
         return new Response(query.regex, query.text, getMatches(query));
     }

fdks/fdk-java/examples/regex-query/src/main/java/com/fnproject/fn/examples/Response.java renamed to fdks/fdk-java/examples/regex-query/src/main/java/com/example/fn/Response.java

@@ -1,4 +1,4 @@
-package com.fnproject.fn.examples;
+package com.example.fn;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

fdks/fdk-java/examples/regex-query/src/test/java/com/fnproject/fn/examples/RegexQueryTests.java renamed to fdks/fdk-java/examples/regex-query/src/test/java/com/example/fn/RegexQueryTests.java

@@ -1,4 +1,4 @@
-package com.fnproject.fn.examples;
+package com.example.fn;
 
 import com.fnproject.fn.testing.FnTestingRule;
 import org.json.JSONException;