From 6329c677c2e1442ddd7f4d0adcfa306b9c63d195 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Mon, 11 Nov 2024 14:54:20 +0100 Subject: [PATCH 1/8] [maven spring boot] Use the new spring boot integration --- templates/java-maven-spring-boot/pom.xml | 33 ++++--------------- .../com/example/restatestarter/Greeter.java | 7 ++-- .../restatestarter/HelloController.java | 21 ++++++++++++ .../restatestarter/RestateEndpoint.java | 18 ---------- .../RestateStarterApplication.java | 2 ++ .../src/main/resources/application.properties | 11 ++++++- 6 files changed, 41 insertions(+), 51 deletions(-) create mode 100644 templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/HelloController.java delete mode 100644 templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateEndpoint.java diff --git a/templates/java-maven-spring-boot/pom.xml b/templates/java-maven-spring-boot/pom.xml index 6fee224c..cece0a22 100644 --- a/templates/java-maven-spring-boot/pom.xml +++ b/templates/java-maven-spring-boot/pom.xml @@ -28,43 +28,22 @@ 17 - 1.1.1 + 1.2.0-SNAPSHOT org.springframework.boot spring-boot-starter - - - dev.restate - sdk-api - ${restate.version} - - - dev.restate - sdk-http-vertx - ${restate.version} - - - + + org.springframework.boot + spring-boot-starter-web + dev.restate - sdk-serde-jackson + sdk-spring-boot-starter ${restate.version} - - com.fasterxml.jackson.core - jackson-databind - 2.15.3 - - - - - org.apache.logging.log4j - log4j-core - 2.22.0 - diff --git a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Greeter.java b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Greeter.java index 6a1e53d4..78d264a4 100644 --- a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Greeter.java +++ b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Greeter.java @@ -13,16 +13,13 @@ import dev.restate.sdk.Context; import dev.restate.sdk.annotation.Handler; -import dev.restate.sdk.annotation.Service; -import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder; +import dev.restate.sdk.springboot.RestateService; import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; /** * Template of a Restate service and handler. */ -@Component -@Service +@RestateService public class Greeter { @Value("${greetingPrefix}") diff --git a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/HelloController.java b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/HelloController.java new file mode 100644 index 00000000..c89d24a1 --- /dev/null +++ b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/HelloController.java @@ -0,0 +1,21 @@ +package com.example.restatestarter; + +import dev.restate.sdk.client.Client; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + private final Client restateClient; + + public HelloController(Client restateClient) { + this.restateClient = restateClient; + } + + @GetMapping("/") + public String index() { + return GreeterClient.fromClient(restateClient).greet("Francesco") + " from Spring Boot!"; + } + +} \ No newline at end of file diff --git a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateEndpoint.java b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateEndpoint.java deleted file mode 100644 index fbec3885..00000000 --- a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateEndpoint.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.restatestarter; - -import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -@Component -public class RestateEndpoint implements ApplicationRunner { - - @Autowired private Greeter greeter; - - @Override - public void run(ApplicationArguments args) { - RestateHttpEndpointBuilder.builder().bind(greeter).buildAndListen(); - } -} diff --git a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateStarterApplication.java b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateStarterApplication.java index c0da6530..9bc8f2b0 100644 --- a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateStarterApplication.java +++ b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/RestateStarterApplication.java @@ -1,9 +1,11 @@ package com.example.restatestarter; +import dev.restate.sdk.springboot.EnableRestate; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication +@EnableRestate public class RestateStarterApplication { public static void main(String[] args) { diff --git a/templates/java-maven-spring-boot/src/main/resources/application.properties b/templates/java-maven-spring-boot/src/main/resources/application.properties index 6fdf742f..a2d62b72 100644 --- a/templates/java-maven-spring-boot/src/main/resources/application.properties +++ b/templates/java-maven-spring-boot/src/main/resources/application.properties @@ -1,2 +1,11 @@ spring.application.name=restate-starter -greetingPrefix=Hello Mr. \ No newline at end of file +greetingPrefix=Hello Mr. + +# Restate SDK port (to expose Greeter) +restate.sdk.http.port=9080 + +# Where Restate ingress is available +restate.client.base-uri=http://localhost:8080 + +# The spring server (for Hello Controller) +server.port=3000 \ No newline at end of file From 2375b9f9fc53f0aced81044d06fa25d78744cb31 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 11:26:20 +0100 Subject: [PATCH 2/8] Bump Java SDK to 1.2.0 --- basics/basics-java/build.gradle.kts | 2 +- basics/basics-kotlin/build.gradle.kts | 2 +- .../java/food-ordering/app/restate-app/build.gradle.kts | 2 +- .../java/food-ordering/app/restaurant/build.gradle.kts | 2 +- .../kotlin/food-ordering/app/restate-app/build.gradle.kts | 2 +- .../kotlin/food-ordering/app/restaurant/build.gradle.kts | 2 +- .../async-signals-payment-java/build.gradle.kts | 2 +- .../integrations/java-spring/build.gradle.kts | 2 +- .../payment-state-machine-java/build.gradle.kts | 2 +- patterns-use-cases/sagas/sagas-java/build.gradle.kts | 2 +- patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts | 2 +- templates/java-gradle/build.gradle.kts | 2 +- templates/java-maven-quarkus/pom.xml | 2 +- templates/java-maven-spring-boot/pom.xml | 2 +- templates/java-maven/pom.xml | 8 ++++---- .../kotlin-gradle-lambda-cdk/lambda/build.gradle.kts | 2 +- templates/kotlin-gradle/build.gradle.kts | 2 +- tutorials/tour-of-restate-java/build.gradle.kts | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/basics/basics-java/build.gradle.kts b/basics/basics-java/build.gradle.kts index 29345680..52fec463 100644 --- a/basics/basics-java/build.gradle.kts +++ b/basics/basics-java/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { annotationProcessor("dev.restate:sdk-api-gen:$restateVersion") diff --git a/basics/basics-kotlin/build.gradle.kts b/basics/basics-kotlin/build.gradle.kts index ef9349ef..ca19651b 100644 --- a/basics/basics-kotlin/build.gradle.kts +++ b/basics/basics-kotlin/build.gradle.kts @@ -11,7 +11,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Annotation processor diff --git a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts index 1a7a7535..386c4f3f 100644 --- a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts @@ -11,7 +11,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Restate SDK diff --git a/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts index f05c6ee9..1bf9d432 100644 --- a/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts @@ -10,7 +10,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Kafka diff --git a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts index f462acd6..be8afd12 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Restate SDK diff --git a/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts index 9796c65c..9bbcdd8a 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts @@ -5,7 +5,7 @@ plugins { repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Kafka diff --git a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts index b07fd40a..c1488f13 100644 --- a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts +++ b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts @@ -8,7 +8,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { annotationProcessor("dev.restate:sdk-api-gen:$restateVersion") diff --git a/patterns-use-cases/integrations/java-spring/build.gradle.kts b/patterns-use-cases/integrations/java-spring/build.gradle.kts index 12ab9237..12d342fa 100644 --- a/patterns-use-cases/integrations/java-spring/build.gradle.kts +++ b/patterns-use-cases/integrations/java-spring/build.gradle.kts @@ -9,7 +9,7 @@ plugins { group = "dev.restate.examples" version = "0.0.1-SNAPSHOT" -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" java { toolchain { diff --git a/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts b/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts index 0616a0cf..d774513f 100644 --- a/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts +++ b/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts @@ -10,7 +10,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { annotationProcessor("dev.restate:sdk-api-gen:$restateVersion") diff --git a/patterns-use-cases/sagas/sagas-java/build.gradle.kts b/patterns-use-cases/sagas/sagas-java/build.gradle.kts index 206f1a56..ee1ab1b1 100644 --- a/patterns-use-cases/sagas/sagas-java/build.gradle.kts +++ b/patterns-use-cases/sagas/sagas-java/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { annotationProcessor("dev.restate:sdk-api-gen:$restateVersion") diff --git a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts index 7ed68bb1..0f81e8f5 100644 --- a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts +++ b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts @@ -11,7 +11,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Annotation processor diff --git a/templates/java-gradle/build.gradle.kts b/templates/java-gradle/build.gradle.kts index b5d6c30a..313857c2 100644 --- a/templates/java-gradle/build.gradle.kts +++ b/templates/java-gradle/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { annotationProcessor("dev.restate:sdk-api-gen:$restateVersion") diff --git a/templates/java-maven-quarkus/pom.xml b/templates/java-maven-quarkus/pom.xml index d7a30064..d54f47d1 100644 --- a/templates/java-maven-quarkus/pom.xml +++ b/templates/java-maven-quarkus/pom.xml @@ -15,7 +15,7 @@ 3.15.1 true 3.3.1 - 1.1.1 + 1.2.0 diff --git a/templates/java-maven-spring-boot/pom.xml b/templates/java-maven-spring-boot/pom.xml index cece0a22..76a5b266 100644 --- a/templates/java-maven-spring-boot/pom.xml +++ b/templates/java-maven-spring-boot/pom.xml @@ -28,7 +28,7 @@ 17 - 1.2.0-SNAPSHOT + 1.2.0 diff --git a/templates/java-maven/pom.xml b/templates/java-maven/pom.xml index 1bb8c27d..8921139c 100644 --- a/templates/java-maven/pom.xml +++ b/templates/java-maven/pom.xml @@ -13,9 +13,9 @@ UTF-8 - 11 - 11 - 1.1.1 + 17 + 17 + 1.2.0 @@ -46,7 +46,7 @@ org.apache.logging.log4j log4j-core - 2.22.0 + 2.24.1 diff --git a/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts b/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts index 07c64f00..a0cbdfc5 100644 --- a/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts +++ b/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts @@ -14,7 +14,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Annotation processor diff --git a/templates/kotlin-gradle/build.gradle.kts b/templates/kotlin-gradle/build.gradle.kts index 9c3f5b5f..c9dc4cb0 100644 --- a/templates/kotlin-gradle/build.gradle.kts +++ b/templates/kotlin-gradle/build.gradle.kts @@ -11,7 +11,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Annotation processor diff --git a/tutorials/tour-of-restate-java/build.gradle.kts b/tutorials/tour-of-restate-java/build.gradle.kts index 7387d001..e870ce6b 100644 --- a/tutorials/tour-of-restate-java/build.gradle.kts +++ b/tutorials/tour-of-restate-java/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -val restateVersion = "1.1.1" +val restateVersion = "1.2.0" dependencies { // Restate SDK From a0aebfbc594e44f2f00982e9162c8bfc54682ac2 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 11:30:32 +0100 Subject: [PATCH 3/8] [maven template] Add maven wrapper --- .../.mvn/wrapper/maven-wrapper.properties | 19 ++ templates/java-maven/mvnw | 259 ++++++++++++++++++ templates/java-maven/mvnw.cmd | 149 ++++++++++ 3 files changed, 427 insertions(+) create mode 100644 templates/java-maven/.mvn/wrapper/maven-wrapper.properties create mode 100755 templates/java-maven/mvnw create mode 100644 templates/java-maven/mvnw.cmd diff --git a/templates/java-maven/.mvn/wrapper/maven-wrapper.properties b/templates/java-maven/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..d58dfb70 --- /dev/null +++ b/templates/java-maven/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/templates/java-maven/mvnw b/templates/java-maven/mvnw new file mode 100755 index 00000000..19529ddf --- /dev/null +++ b/templates/java-maven/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/templates/java-maven/mvnw.cmd b/templates/java-maven/mvnw.cmd new file mode 100644 index 00000000..b150b91e --- /dev/null +++ b/templates/java-maven/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" From edbc27c6c043be545fa6bae47957ca9880afc416 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 11:53:15 +0100 Subject: [PATCH 4/8] [maven template] Add example test + how to run command --- templates/java-maven/README.md | 6 ++++ templates/java-maven/pom.xml | 29 ++++++++++++++++ .../src/main/java/my/example/Greeter.java | 2 +- .../src/test/java/my/example/GreeterTest.java | 34 +++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 templates/java-maven/src/test/java/my/example/GreeterTest.java diff --git a/templates/java-maven/README.md b/templates/java-maven/README.md index ee76debe..f032c39c 100644 --- a/templates/java-maven/README.md +++ b/templates/java-maven/README.md @@ -3,3 +3,9 @@ Sample project configuration of a Restate service using the Java SDK and HTTP server. Have a look at the [Java Quickstart guide](https://docs.restate.dev/get_started/quickstart?sdk=java) for more information on how to use this project. + +To run: + +```shell +mvn compile exec:java +``` \ No newline at end of file diff --git a/templates/java-maven/pom.xml b/templates/java-maven/pom.xml index 8921139c..ff522e8f 100644 --- a/templates/java-maven/pom.xml +++ b/templates/java-maven/pom.xml @@ -48,8 +48,32 @@ log4j-core 2.24.1 + + + org.junit.jupiter + junit-jupiter + test + + + dev.restate + sdk-testing + ${restate.version} + + + + + + org.junit + junit-bom + 5.11.3 + pom + import + + + + @@ -77,6 +101,11 @@ my.example.Greeter + + + maven-surefire-plugin + 3.5.1 + diff --git a/templates/java-maven/src/main/java/my/example/Greeter.java b/templates/java-maven/src/main/java/my/example/Greeter.java index ef1d5d09..9ed68256 100644 --- a/templates/java-maven/src/main/java/my/example/Greeter.java +++ b/templates/java-maven/src/main/java/my/example/Greeter.java @@ -25,7 +25,7 @@ public class Greeter { @Handler public String greet(Context ctx, String greeting) { - return greeting; + return "Hello " + greeting; } public static void main(String[] args) { diff --git a/templates/java-maven/src/test/java/my/example/GreeterTest.java b/templates/java-maven/src/test/java/my/example/GreeterTest.java new file mode 100644 index 00000000..f7954fe7 --- /dev/null +++ b/templates/java-maven/src/test/java/my/example/GreeterTest.java @@ -0,0 +1,34 @@ +// Copyright (c) 2023 - Restate Software, Inc., Restate GmbH +// +// This file is part of the Restate Java SDK, +// which is released under the MIT license. +// +// You can find a copy of the license in file LICENSE in the root +// directory of this repository or package, or at +// https://github.com/restatedev/sdk-java/blob/main/LICENSE +package my.example; + +import dev.restate.sdk.client.Client; +import dev.restate.sdk.testing.BindService; +import dev.restate.sdk.testing.RestateClient; +import dev.restate.sdk.testing.RestateTest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@RestateTest +class GreeterTest { + + @BindService + private final Greeter greeter = new Greeter(); + + @Test + @Timeout(value = 10) + void testGreet(@RestateClient Client ingressClient) { + var client = GreeterClient.fromClient(ingressClient); + + String response = client.greet("Francesco"); + assertEquals(response, "Hello Francesco"); + } +} From 2cb88bcc9d5ed62f4b80dd645d74c9001458ce5c Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 11:53:22 +0100 Subject: [PATCH 5/8] [gradle template] Add example test + how to run command --- templates/java-gradle/README.md | 6 ++++ templates/java-gradle/build.gradle.kts | 10 +++++- .../src/main/java/my/example/Greeter.java | 2 +- .../src/test/java/my/example/GreeterTest.java | 34 +++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 templates/java-gradle/src/test/java/my/example/GreeterTest.java diff --git a/templates/java-gradle/README.md b/templates/java-gradle/README.md index ee76debe..c2e1bbdc 100644 --- a/templates/java-gradle/README.md +++ b/templates/java-gradle/README.md @@ -3,3 +3,9 @@ Sample project configuration of a Restate service using the Java SDK and HTTP server. Have a look at the [Java Quickstart guide](https://docs.restate.dev/get_started/quickstart?sdk=java) for more information on how to use this project. + +To run: + +```shell +./gradlew run +``` \ No newline at end of file diff --git a/templates/java-gradle/build.gradle.kts b/templates/java-gradle/build.gradle.kts index 313857c2..bf0b63f5 100644 --- a/templates/java-gradle/build.gradle.kts +++ b/templates/java-gradle/build.gradle.kts @@ -21,10 +21,18 @@ dependencies { implementation("dev.restate:sdk-serde-jackson:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") + + testImplementation(platform("org.junit:junit-bom:5.11.3")) + testImplementation("org.junit.jupiter:junit-jupiter") + testImplementation("dev.restate:sdk-testing:$restateVersion") } // Set main class application { mainClass.set("my.example.Greeter") +} + +tasks.named("test") { + useJUnitPlatform() } \ No newline at end of file diff --git a/templates/java-gradle/src/main/java/my/example/Greeter.java b/templates/java-gradle/src/main/java/my/example/Greeter.java index ef1d5d09..9ed68256 100644 --- a/templates/java-gradle/src/main/java/my/example/Greeter.java +++ b/templates/java-gradle/src/main/java/my/example/Greeter.java @@ -25,7 +25,7 @@ public class Greeter { @Handler public String greet(Context ctx, String greeting) { - return greeting; + return "Hello " + greeting; } public static void main(String[] args) { diff --git a/templates/java-gradle/src/test/java/my/example/GreeterTest.java b/templates/java-gradle/src/test/java/my/example/GreeterTest.java new file mode 100644 index 00000000..f7954fe7 --- /dev/null +++ b/templates/java-gradle/src/test/java/my/example/GreeterTest.java @@ -0,0 +1,34 @@ +// Copyright (c) 2023 - Restate Software, Inc., Restate GmbH +// +// This file is part of the Restate Java SDK, +// which is released under the MIT license. +// +// You can find a copy of the license in file LICENSE in the root +// directory of this repository or package, or at +// https://github.com/restatedev/sdk-java/blob/main/LICENSE +package my.example; + +import dev.restate.sdk.client.Client; +import dev.restate.sdk.testing.BindService; +import dev.restate.sdk.testing.RestateClient; +import dev.restate.sdk.testing.RestateTest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@RestateTest +class GreeterTest { + + @BindService + private final Greeter greeter = new Greeter(); + + @Test + @Timeout(value = 10) + void testGreet(@RestateClient Client ingressClient) { + var client = GreeterClient.fromClient(ingressClient); + + String response = client.greet("Francesco"); + assertEquals(response, "Hello Francesco"); + } +} From 225f10292980378c8b5cc87b6b92d301713bcb72 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 11:58:47 +0100 Subject: [PATCH 6/8] [spring boot] Add test example --- templates/java-maven-spring-boot/README.md | 2 +- templates/java-maven-spring-boot/pom.xml | 11 ++++++ .../example/restatestarter/GreeterTest.java | 35 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java diff --git a/templates/java-maven-spring-boot/README.md b/templates/java-maven-spring-boot/README.md index 8623e543..42614ea7 100644 --- a/templates/java-maven-spring-boot/README.md +++ b/templates/java-maven-spring-boot/README.md @@ -9,5 +9,5 @@ Have a look at the [Java Quickstart guide](https://docs.restate.dev/get_started/ To start the service, simply run: ```shell -$ mvn spring-boot:run +$ mvn compile spring-boot:run ``` \ No newline at end of file diff --git a/templates/java-maven-spring-boot/pom.xml b/templates/java-maven-spring-boot/pom.xml index 76a5b266..be045088 100644 --- a/templates/java-maven-spring-boot/pom.xml +++ b/templates/java-maven-spring-boot/pom.xml @@ -44,6 +44,17 @@ sdk-spring-boot-starter ${restate.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + dev.restate + sdk-testing + ${restate.version} + diff --git a/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java b/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java new file mode 100644 index 00000000..107037c4 --- /dev/null +++ b/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java @@ -0,0 +1,35 @@ +// Copyright (c) 2023 - Restate Software, Inc., Restate GmbH +// +// This file is part of the Restate Java SDK, +// which is released under the MIT license. +// +// You can find a copy of the license in file LICENSE in the root +// directory of this repository or package, or at +// https://github.com/restatedev/sdk-java/blob/main/LICENSE +package com.example.restatestarter; + +import dev.restate.sdk.client.Client; +import dev.restate.sdk.testing.*; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest( + classes = Greeter.class, + properties = {"greetingPrefix=Ciao "}) +@RestateTest +public class GreeterTest { + + @Autowired @BindService private Greeter greeter; + + @Test + @Timeout(value = 10) + void greet(@RestateClient Client ingressClient) { + var client = GreeterClient.fromClient(ingressClient); + + assertThat(client.greet("Francesco")).isEqualTo("Ciao Francesco"); + } +} From ccf0452a3af13ce00c3f39824e4305a03cdf32eb Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 12:03:38 +0100 Subject: [PATCH 7/8] Various dependency bumps --- basics/basics-java/build.gradle.kts | 2 +- basics/basics-kotlin/build.gradle.kts | 4 ++-- .../java/food-ordering/app/restate-app/build.gradle.kts | 2 +- .../java/food-ordering/app/restaurant/build.gradle.kts | 2 +- .../kotlin/food-ordering/app/restate-app/build.gradle.kts | 2 +- .../kotlin/kmp-android-todo-app/server/build.gradle.kts | 4 ++-- .../kotlin/kmp-android-todo-app/shared/build.gradle.kts | 2 +- .../async-signals-payment-java/build.gradle.kts | 2 +- patterns-use-cases/integrations/java-spring/build.gradle.kts | 2 +- patterns-use-cases/sagas/sagas-java/build.gradle.kts | 2 +- patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts | 4 ++-- templates/kotlin-gradle/build.gradle.kts | 4 ++-- tutorials/tour-of-restate-java/build.gradle.kts | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/basics/basics-java/build.gradle.kts b/basics/basics-java/build.gradle.kts index 52fec463..30919288 100644 --- a/basics/basics-java/build.gradle.kts +++ b/basics/basics-java/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } // Set main class diff --git a/basics/basics-kotlin/build.gradle.kts b/basics/basics-kotlin/build.gradle.kts index ca19651b..a8cb6338 100644 --- a/basics/basics-kotlin/build.gradle.kts +++ b/basics/basics-kotlin/build.gradle.kts @@ -22,10 +22,10 @@ dependencies { implementation("dev.restate:sdk-http-vertx:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.23.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") // Kotlinx serialization (optional) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") } // Setup Java/Kotlin compiler target diff --git a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts index 386c4f3f..8bd259da 100644 --- a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { implementation("org.apache.kafka:kafka-clients:3.6.1") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } // Set main class diff --git a/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts index 1bf9d432..156483d7 100644 --- a/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } diff --git a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts index be8afd12..de08519b 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { implementation("org.apache.kafka:kafka-clients:3.6.1") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.23.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } // Set main class diff --git a/end-to-end-applications/kotlin/kmp-android-todo-app/server/build.gradle.kts b/end-to-end-applications/kotlin/kmp-android-todo-app/server/build.gradle.kts index cc4cbdc7..f7fa9667 100644 --- a/end-to-end-applications/kotlin/kmp-android-todo-app/server/build.gradle.kts +++ b/end-to-end-applications/kotlin/kmp-android-todo-app/server/build.gradle.kts @@ -11,7 +11,7 @@ version = "1.0.0" val restateVersion = "1.1.0" kotlin { - jvmToolchain(11) + jvmToolchain(17) } dependencies { @@ -24,7 +24,7 @@ dependencies { implementation("dev.restate:sdk-api-kotlin:$restateVersion") implementation("dev.restate:sdk-http-vertx:$restateVersion") - implementation("org.apache.logging.log4j:log4j-core:2.23.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } application { diff --git a/end-to-end-applications/kotlin/kmp-android-todo-app/shared/build.gradle.kts b/end-to-end-applications/kotlin/kmp-android-todo-app/shared/build.gradle.kts index 48fb0fa6..a5e5dfa5 100644 --- a/end-to-end-applications/kotlin/kmp-android-todo-app/shared/build.gradle.kts +++ b/end-to-end-applications/kotlin/kmp-android-todo-app/shared/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { jvm() - jvmToolchain(11) + jvmToolchain(17) sourceSets { commonMain.dependencies { diff --git a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts index c1488f13..633d539f 100644 --- a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts +++ b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { implementation("com.google.code.gson:gson:2.10.1") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } // Set main class diff --git a/patterns-use-cases/integrations/java-spring/build.gradle.kts b/patterns-use-cases/integrations/java-spring/build.gradle.kts index 12d342fa..d10093bb 100644 --- a/patterns-use-cases/integrations/java-spring/build.gradle.kts +++ b/patterns-use-cases/integrations/java-spring/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("org.postgresql", "postgresql") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } // Set main class diff --git a/patterns-use-cases/sagas/sagas-java/build.gradle.kts b/patterns-use-cases/sagas/sagas-java/build.gradle.kts index ee1ab1b1..ce5a4e48 100644 --- a/patterns-use-cases/sagas/sagas-java/build.gradle.kts +++ b/patterns-use-cases/sagas/sagas-java/build.gradle.kts @@ -21,5 +21,5 @@ dependencies { implementation("dev.restate:sdk-serde-jackson:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } diff --git a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts index 0f81e8f5..ff074298 100644 --- a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts +++ b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts @@ -22,10 +22,10 @@ dependencies { implementation("dev.restate:sdk-http-vertx:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.23.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") // Kotlinx serialization (optional) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") } // Setup Java/Kotlin compiler target diff --git a/templates/kotlin-gradle/build.gradle.kts b/templates/kotlin-gradle/build.gradle.kts index c9dc4cb0..a3f45e4b 100644 --- a/templates/kotlin-gradle/build.gradle.kts +++ b/templates/kotlin-gradle/build.gradle.kts @@ -22,10 +22,10 @@ dependencies { implementation("dev.restate:sdk-http-vertx:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.23.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") // Kotlinx serialization (optional) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") } // Setup Java/Kotlin compiler target diff --git a/tutorials/tour-of-restate-java/build.gradle.kts b/tutorials/tour-of-restate-java/build.gradle.kts index e870ce6b..8d4a510b 100644 --- a/tutorials/tour-of-restate-java/build.gradle.kts +++ b/tutorials/tour-of-restate-java/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.24.1") } // Set main class From 489ccb94cff5c66eae56515a506c87a0ec9acf63 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 20 Nov 2024 12:06:04 +0100 Subject: [PATCH 8/8] JPA Spring boot example now uses the new spring boot integration --- .../integrations/java-spring/build.gradle.kts | 4 +--- .../java/dev/restate/examples/AppMain.java | 2 ++ .../dev/restate/examples/ProductService.java | 12 ++++++++---- .../dev/restate/examples/RestateEndpoint.java | 18 ------------------ 4 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/RestateEndpoint.java diff --git a/patterns-use-cases/integrations/java-spring/build.gradle.kts b/patterns-use-cases/integrations/java-spring/build.gradle.kts index d10093bb..8d251133 100644 --- a/patterns-use-cases/integrations/java-spring/build.gradle.kts +++ b/patterns-use-cases/integrations/java-spring/build.gradle.kts @@ -31,9 +31,7 @@ dependencies { implementation("org.springframework.boot", "spring-boot-starter-data-jpa") // Restate SDK - implementation("dev.restate:sdk-api:$restateVersion") - implementation("dev.restate:sdk-http-vertx:$restateVersion") - // To use Jackson to read/write state entries (optional) + implementation("dev.restate:sdk-spring-boot-starter:$restateVersion") implementation("dev.restate:sdk-serde-jackson:$restateVersion") implementation("org.postgresql", "postgresql") diff --git a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/AppMain.java b/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/AppMain.java index edd067a0..4224a828 100644 --- a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/AppMain.java +++ b/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/AppMain.java @@ -1,9 +1,11 @@ package dev.restate.examples; +import dev.restate.sdk.springboot.EnableRestate; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication +@EnableRestate public class AppMain { public static void main(String[] args) { diff --git a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/ProductService.java b/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/ProductService.java index 8911f824..54a3b774 100644 --- a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/ProductService.java +++ b/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/ProductService.java @@ -8,16 +8,20 @@ import dev.restate.sdk.common.Serde; import dev.restate.sdk.common.TerminalException; import dev.restate.sdk.serde.jackson.JacksonSerdes; +import dev.restate.sdk.springboot.RestateVirtualObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -@Component -@VirtualObject +@RestateVirtualObject public class ProductService { - @Autowired private ProductRepository productRepository; + private static final Serde productSerde = JacksonSerdes.of(Product.class); - private Serde productSerde = JacksonSerdes.of(Product.class); + private final ProductRepository productRepository; + + public ProductService(ProductRepository productRepository) { + this.productRepository = productRepository; + } @Handler public Product getProductInformation(ObjectContext ctx) { diff --git a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/RestateEndpoint.java b/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/RestateEndpoint.java deleted file mode 100644 index 44d4d4f6..00000000 --- a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/RestateEndpoint.java +++ /dev/null @@ -1,18 +0,0 @@ -package dev.restate.examples; - -import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -@Component -public class RestateEndpoint implements ApplicationRunner { - - @Autowired private ProductService productService; - - @Override - public void run(ApplicationArguments args) throws Exception { - RestateHttpEndpointBuilder.builder().bind(productService).buildAndListen(); - } -}