This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/flink-statefun-playground.git
The following commit(s) were added to refs/heads/dev by this push:
new 2cc9b54 [hotfix] Sync all current examples with latest StateFun core
changes
2cc9b54 is described below
commit 2cc9b54572ebc1c4e322ad442d5208b104c5a00d
Author: Tzu-Li (Gordon) Tai <tzuli...@apache.org>
AuthorDate: Thu Mar 25 16:00:31 2021 +0800
[hotfix] Sync all current examples with latest StateFun core changes
---
java/greeter/Dockerfile | 16 ++++++++--------
java/greeter/docker-compose.yml | 4 ++--
java/greeter/module.yaml | 9 ++++-----
java/greeter/pom.xml | 2 +-
...SHOT.jar => statefun-sdk-java-3.0-SNAPSHOT.jar} | Bin 1855003 -> 1856788
bytes
java/showcase/pom.xml | 2 +-
.../serving/StatefulFunctionsRuntimeProcesses.java | 4 ++--
java/showcase/src/main/resources/module.yaml | 9 ++++-----
python/greeter/Dockerfile | 4 ++--
python/greeter/docker-compose.yml | 4 ++--
...e_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl} | Bin 32722 -> 32861 bytes
python/greeter/module.yaml | 9 ++++-----
12 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/java/greeter/Dockerfile b/java/greeter/Dockerfile
index ef8a3bc..f87ea11 100644
--- a/java/greeter/Dockerfile
+++ b/java/greeter/Dockerfile
@@ -18,14 +18,14 @@ FROM maven:3.6.3-jdk-11 AS builder
COPY src /usr/src/app/src
COPY pom.xml /usr/src/app
# TODO remove these commented lines and the jar; this is needed now only
because we don't have the latest Java SDK published to Maven central yet
-# COPY statefun-sdk-java-2.3-SNAPSHOT.jar /usr/src/app
-# RUN mvn install:install-file \
-# -Dfile=/usr/src/app/statefun-sdk-java-2.3-SNAPSHOT.jar \
-# -DgroupId=org.apache.flink \
-# -DartifactId=statefun-sdk-java \
-# -Dversion=2.3-SNAPSHOT \
-# -Dpackaging=jar \
-# -DgeneratePom=true
+COPY statefun-sdk-java-3.0-SNAPSHOT.jar /usr/src/app
+RUN mvn install:install-file \
+ -Dfile=/usr/src/app/statefun-sdk-java-3.0-SNAPSHOT.jar \
+ -DgroupId=org.apache.flink \
+ -DartifactId=statefun-sdk-java \
+ -Dversion=3.0-SNAPSHOT \
+ -Dpackaging=jar \
+ -DgeneratePom=true
RUN mvn -f /usr/src/app/pom.xml clean package
# ... and run the web server!
diff --git a/java/greeter/docker-compose.yml b/java/greeter/docker-compose.yml
index dc57374..22b2dd3 100644
--- a/java/greeter/docker-compose.yml
+++ b/java/greeter/docker-compose.yml
@@ -35,7 +35,7 @@ services:
###############################################################
statefun-manager:
- image: flink-statefun:2.3-SNAPSHOT
+ image: flink-statefun:3.0-SNAPSHOT
expose:
- "6123"
ports:
@@ -47,7 +47,7 @@ services:
- ./module.yaml:/opt/statefun/modules/greeter/module.yaml
statefun-worker:
- image: flink-statefun:2.3-SNAPSHOT
+ image: flink-statefun:3.0-SNAPSHOT
expose:
- "6121"
- "6122"
diff --git a/java/greeter/module.yaml b/java/greeter/module.yaml
index 9a06195..92b0ab2 100644
--- a/java/greeter/module.yaml
+++ b/java/greeter/module.yaml
@@ -24,13 +24,12 @@ module:
meta:
kind: http
spec:
- typename:
- namespace: greeter.fns
+ functions: greeter.fns/*
urlPathTemplate: http://greeter-functions:1108/
ingresses:
- ingress:
meta:
- type: statefun.kafka.io/routable-protobuf-ingress
+ type: io.statefun.kafka/ingress
id: greeter.io/user-logins
spec:
address: kafka:9092
@@ -39,13 +38,13 @@ module:
type: earliest
topics:
- topic: user-logins
- typeUrl:
greeter.types/org.apache.flink.statefun.playground.java.greeter.types.UserLogin
+ valueType:
greeter.types/org.apache.flink.statefun.playground.java.greeter.types.UserLogin
targets:
- greeter.fns/user
egresses:
- egress:
meta:
- type: statefun.kafka.io/generic-egress
+ type: io.statefun.kafka/egress
id: greeter.io/user-greetings
spec:
address: kafka:9092
diff --git a/java/greeter/pom.xml b/java/greeter/pom.xml
index c30299e..89f7616 100644
--- a/java/greeter/pom.xml
+++ b/java/greeter/pom.xml
@@ -26,7 +26,7 @@ under the License.
<packaging>jar</packaging>
<properties>
- <statefun.version>2.3-SNAPSHOT</statefun.version>
+ <statefun.version>3.0-SNAPSHOT</statefun.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
diff --git a/java/greeter/statefun-sdk-java-2.3-SNAPSHOT.jar
b/java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar
similarity index 92%
rename from java/greeter/statefun-sdk-java-2.3-SNAPSHOT.jar
rename to java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar
index 60fbd1d..47f65ac 100644
Binary files a/java/greeter/statefun-sdk-java-2.3-SNAPSHOT.jar and
b/java/greeter/statefun-sdk-java-3.0-SNAPSHOT.jar differ
diff --git a/java/showcase/pom.xml b/java/showcase/pom.xml
index 5f7b1c1..55d17bd 100644
--- a/java/showcase/pom.xml
+++ b/java/showcase/pom.xml
@@ -26,7 +26,7 @@ under the License.
<packaging>jar</packaging>
<properties>
- <statefun.version>2.3-SNAPSHOT</statefun.version>
+ <statefun.version>3.0-SNAPSHOT</statefun.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
diff --git
a/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
b/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
index 34fa6ca..993fc66 100644
---
a/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
+++
b/java/showcase/src/main/java/org/apache/flink/statefun/playground/java/showcase/part6/serving/StatefulFunctionsRuntimeProcesses.java
@@ -86,7 +86,7 @@ public final class StatefulFunctionsRuntimeProcesses {
}
private static GenericContainer<?> managerContainer(Network network) {
- return new
GenericContainer<>(DockerImageName.parse("flink-statefun:2.3-SNAPSHOT"))
+ return new
GenericContainer<>(DockerImageName.parse("flink-statefun:3.0-SNAPSHOT"))
.withNetwork(network)
.withNetworkAliases("statefun-manager")
.withEnv("ROLE", "master")
@@ -98,7 +98,7 @@ public final class StatefulFunctionsRuntimeProcesses {
}
private static GenericContainer<?> workerContainer(Network network) {
- return new
GenericContainer<>(DockerImageName.parse("flink-statefun:2.3-SNAPSHOT"))
+ return new
GenericContainer<>(DockerImageName.parse("flink-statefun:3.0-SNAPSHOT"))
.withNetwork(network)
.withNetworkAliases("statefun-worker")
.withEnv("ROLE", "worker")
diff --git a/java/showcase/src/main/resources/module.yaml
b/java/showcase/src/main/resources/module.yaml
index 529eaf4..46ac680 100644
--- a/java/showcase/src/main/resources/module.yaml
+++ b/java/showcase/src/main/resources/module.yaml
@@ -24,8 +24,7 @@ module:
meta:
kind: http
spec:
- typename:
- namespace: java.showcase.fns
+ functions: java.showcase.fns/*
urlPathTemplate: http://host.testcontainers.internal:1108/
timeouts:
call: 1day # setting a very high timeout here facilitates the
user
@@ -34,7 +33,7 @@ module:
ingresses:
- ingress:
meta:
- type: statefun.kafka.io/routable-protobuf-ingress
+ type: io.statefun.kafka/ingress
id: java.showcase.io/user-logins
spec:
address: kafka:9092
@@ -43,13 +42,13 @@ module:
type: earliest
topics:
- topic: user-logins
- typeUrl:
java.showcase.types/org.apache.flink.statefun.playground.java.showcase.part1.types.UserLogin
+ valueType:
java.showcase.types/org.apache.flink.statefun.playground.java.showcase.part1.types.UserLogin
targets:
- java.showcase.fns/user
egresses:
- egress:
meta:
- type: statefun.kafka.io/generic-egress
+ type: io.statefun.kafka/egress
id: java.showcase.io/user-greetings
spec:
address: kafka:9092
diff --git a/python/greeter/Dockerfile b/python/greeter/Dockerfile
index 2bf2758..ef5e756 100644
--- a/python/greeter/Dockerfile
+++ b/python/greeter/Dockerfile
@@ -27,8 +27,8 @@ COPY functions.py /app
EXPOSE 8000
# TODO: remove the following 2 lines, once apache_filink_statefun-3.0.0 will
be released.
-ADD lib-dev/apache_flink_statefun-2.3_SNAPSHOT-py3-none-any.whl /app
-RUN pip3 install /app/apache_flink_statefun-2.3_SNAPSHOT-py3-none-any.whl
+ADD lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl /app
+RUN pip3 install /app/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
CMD ["python3", "/app/functions.py"]
diff --git a/python/greeter/docker-compose.yml
b/python/greeter/docker-compose.yml
index 37f97be..8ab1daa 100644
--- a/python/greeter/docker-compose.yml
+++ b/python/greeter/docker-compose.yml
@@ -34,7 +34,7 @@ services:
###############################################################
statefun-manager:
- image: flink-statefun:2.3-SNAPSHOT
+ image: flink-statefun:3.0-SNAPSHOT
expose:
- "6123"
ports:
@@ -46,7 +46,7 @@ services:
- ./module.yaml:/opt/statefun/modules/greeter/module.yaml
statefun-worker:
- image: flink-statefun:2.3-SNAPSHOT
+ image: flink-statefun:3.0-SNAPSHOT
expose:
- "6121"
- "6122"
diff --git
a/python/greeter/lib-dev/apache_flink_statefun-2.3_SNAPSHOT-py3-none-any.whl
b/python/greeter/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
similarity index 51%
rename from
python/greeter/lib-dev/apache_flink_statefun-2.3_SNAPSHOT-py3-none-any.whl
rename to
python/greeter/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
index 13ef023..cf08fd2 100644
Binary files
a/python/greeter/lib-dev/apache_flink_statefun-2.3_SNAPSHOT-py3-none-any.whl
and
b/python/greeter/lib-dev/apache_flink_statefun-3.0_SNAPSHOT-py3-none-any.whl
differ
diff --git a/python/greeter/module.yaml b/python/greeter/module.yaml
index 5b50885..629d9e0 100644
--- a/python/greeter/module.yaml
+++ b/python/greeter/module.yaml
@@ -22,28 +22,27 @@ module:
meta:
kind: http
spec:
- typename:
- namespace: example
+ functions: example/*
urlPathTemplate: http://functions:8000/statefun
timeouts:
call: 2min
ingresses:
- ingress:
meta:
- type: statefun.kafka.io/routable-protobuf-ingress
+ type: io.statefun.kafka/ingress
id: example/names
spec:
address: kafka:9092
consumerGroupId: my-group-id
topics:
- topic: names
- typeUrl: example/GreetRequest
+ valueType: example/GreetRequest
targets:
- example/person
egresses:
- egress:
meta:
- type: statefun.kafka.io/generic-egress
+ type: io.statefun.kafka/egress
id: example/greets
spec:
address: kafka:9092
