diff --git a/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml index ed24c4c700..0cb9870db4 100644 --- a/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: ]]#${artifactId}#[[ ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml index ed24c4c700..0cb9870db4 100644 --- a/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: ]]#${artifactId}#[[ ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml index ed24c4c700..0cb9870db4 100644 --- a/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: ]]#${artifactId}#[[ ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml index ed24c4c700..0cb9870db4 100644 --- a/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml +++ b/maven-java/kalix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: ]]#${artifactId}#[[ ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ff139bd5fb..7969537a18 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val RuntimeVersion = System.getProperty( "kalix-runtime.version", // temporarily accept the old system property name - System.getProperty("kalix-proxy.version", "1.1.46")) + System.getProperty("kalix-proxy.version", "1.2.0")) } // changing the Scala version of the Java SDK affects end users diff --git a/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml index ff9c2e1ab9..198c4fd04e 100644 --- a/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml +++ b/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-customer-registry-kafka-quickstart # uncomment volumes when persistence is enabled # volumes: diff --git a/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml index 47952acc26..495952ff4f 100644 --- a/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml +++ b/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-customer-registry-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml index c6cd6eb677..b99ee631b5 100644 --- a/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml +++ b/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-customer-registry-views-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-eventsourced-counter/docker-compose.yml b/samples/java-protobuf-eventsourced-counter/docker-compose.yml index 7c03ecc358..e084378832 100644 --- a/samples/java-protobuf-eventsourced-counter/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-eventsourced-counter ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml index 690fba2040..d9b97e5531 100644 --- a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml +++ b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-eventsourced-customer-registry-subscriber depends_on: - kalix-runtime-customer-registry @@ -21,7 +21,7 @@ services: USER_SERVICE_PORT: "8081" kalix-runtime-customer-registry: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml index ed4a649dd6..a810cd2383 100644 --- a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml @@ -6,7 +6,7 @@ services: # on the same local machine as the java-protobuf-eventsourced-customer-registry #tag::customer-registry-subscriber[] kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-eventsourced-customer-registry-subscriber ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml b/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml index f1285e8694..30b23d3cc5 100644 --- a/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-eventsourced-customer-registry ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml b/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml index e51456dfe8..0d9cd151da 100644 --- a/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-eventsourced-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-fibonacci-action/docker-compose.yml b/samples/java-protobuf-fibonacci-action/docker-compose.yml index e14b0ed5b1..fe0254d67a 100644 --- a/samples/java-protobuf-fibonacci-action/docker-compose.yml +++ b/samples/java-protobuf-fibonacci-action/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-fibonacci-action ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-first-service/docker-compose.yml b/samples/java-protobuf-first-service/docker-compose.yml index 36bd208d99..56f33d80a3 100644 --- a/samples/java-protobuf-first-service/docker-compose.yml +++ b/samples/java-protobuf-first-service/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-first-service ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-reliable-timers/docker-compose.yml b/samples/java-protobuf-reliable-timers/docker-compose.yml index a70d798878..f09b93f099 100644 --- a/samples/java-protobuf-reliable-timers/docker-compose.yml +++ b/samples/java-protobuf-reliable-timers/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-reliable-timers ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-replicatedentity-examples/docker-compose.yml b/samples/java-protobuf-replicatedentity-examples/docker-compose.yml index c06cf9fe49..820477c17a 100644 --- a/samples/java-protobuf-replicatedentity-examples/docker-compose.yml +++ b/samples/java-protobuf-replicatedentity-examples/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-replicatedentity-examples ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml b/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml index 24de18b5df..4282c51ed9 100644 --- a/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml +++ b/samples/java-protobuf-replicatedentity-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-replicatedentity-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml b/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml index 1957447b6d..c4b6195151 100644 --- a/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml +++ b/samples/java-protobuf-shopping-cart-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-shopping-cart-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-tracing/docker-compose.yml b/samples/java-protobuf-tracing/docker-compose.yml index f33fea5d49..fb3e43242b 100644 --- a/samples/java-protobuf-tracing/docker-compose.yml +++ b/samples/java-protobuf-tracing/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: tracing ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-transfer-workflow-compensation/docker-compose.yml b/samples/java-protobuf-transfer-workflow-compensation/docker-compose.yml index 1c579b63d2..020ef5b656 100644 --- a/samples/java-protobuf-transfer-workflow-compensation/docker-compose.yml +++ b/samples/java-protobuf-transfer-workflow-compensation/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-transfer-workflow-compensation ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-transfer-workflow/docker-compose.yml b/samples/java-protobuf-transfer-workflow/docker-compose.yml index 3abd4f8944..8a0203e7fc 100644 --- a/samples/java-protobuf-transfer-workflow/docker-compose.yml +++ b/samples/java-protobuf-transfer-workflow/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-transfer-workflow ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-valueentity-counter/docker-compose.yml b/samples/java-protobuf-valueentity-counter/docker-compose.yml index 8bccfc0590..4e56b99211 100644 --- a/samples/java-protobuf-valueentity-counter/docker-compose.yml +++ b/samples/java-protobuf-valueentity-counter/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-valueentity-counter ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml b/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml index f064471a3b..3d3e49c7f3 100644 --- a/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml +++ b/samples/java-protobuf-valueentity-customer-registry/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-valueentity-customer-registry ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml b/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml index 9bfd1f1ace..efdfdf01f0 100644 --- a/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml +++ b/samples/java-protobuf-valueentity-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-valueentity-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-view-store/docker-compose.yml b/samples/java-protobuf-view-store/docker-compose.yml index 7b4fbe3dde..aacd22aa54 100644 --- a/samples/java-protobuf-view-store/docker-compose.yml +++ b/samples/java-protobuf-view-store/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-view-store ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-protobuf-web-resources/docker-compose.yml b/samples/java-protobuf-web-resources/docker-compose.yml index 4a837cdac0..db94457020 100644 --- a/samples/java-protobuf-web-resources/docker-compose.yml +++ b/samples/java-protobuf-web-resources/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-protobuf-web-resources ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-choreography-saga-quickstart/docker-compose.yml b/samples/java-spring-choreography-saga-quickstart/docker-compose.yml index 09574b1a0b..e800b65273 100644 --- a/samples/java-spring-choreography-saga-quickstart/docker-compose.yml +++ b/samples/java-spring-choreography-saga-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-choreography-saga-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-customer-registry-quickstart/docker-compose.yml b/samples/java-spring-customer-registry-quickstart/docker-compose.yml index 5652485942..b957280f53 100644 --- a/samples/java-spring-customer-registry-quickstart/docker-compose.yml +++ b/samples/java-spring-customer-registry-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-customer-registry-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml b/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml index 69e2801363..8611ee1831 100644 --- a/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml +++ b/samples/java-spring-customer-registry-views-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-customer-registry-views-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-doc-snippets/docker-compose.yml b/samples/java-spring-doc-snippets/docker-compose.yml index e86f4cf0e8..12d13482fa 100644 --- a/samples/java-spring-doc-snippets/docker-compose.yml +++ b/samples/java-spring-doc-snippets/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 # uncomment volumes when persistence is enabled volumes: # <1> - ./target/kalix:/var/kalix diff --git a/samples/java-spring-eventsourced-counter/docker-compose.yml b/samples/java-spring-eventsourced-counter/docker-compose.yml index 595dd5ecb4..ecd34f5bbe 100644 --- a/samples/java-spring-eventsourced-counter/docker-compose.yml +++ b/samples/java-spring-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-eventsourced-counter ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml index 6f943614cd..643e37cba1 100644 --- a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml +++ b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose-integration.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-eventsourced-customer-registry-subscriber depends_on: - kalix-runtime-customer-registry @@ -22,7 +22,7 @@ services: USER_SERVICE_PORT: "8081" kalix-runtime-customer-registry: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml index a03826c5ec..504533e484 100644 --- a/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml +++ b/samples/java-spring-eventsourced-customer-registry-subscriber/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-eventsourced-customer-registry-subscriber ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-eventsourced-customer-registry/docker-compose.yml b/samples/java-spring-eventsourced-customer-registry/docker-compose.yml index ba274c88b5..93d2797b67 100644 --- a/samples/java-spring-eventsourced-customer-registry/docker-compose.yml +++ b/samples/java-spring-eventsourced-customer-registry/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-eventsourced-customer-registry ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml b/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml index 8a47386441..35ef06cad5 100644 --- a/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/java-spring-eventsourced-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-eventsourced-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-fibonacci-action/docker-compose.yml b/samples/java-spring-fibonacci-action/docker-compose.yml index 7c8790e93d..6a10fc1af4 100644 --- a/samples/java-spring-fibonacci-action/docker-compose.yml +++ b/samples/java-spring-fibonacci-action/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-fibonacci-action ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-reliable-timers/docker-compose.yml b/samples/java-spring-reliable-timers/docker-compose.yml index a6dfe3ac42..2109750864 100644 --- a/samples/java-spring-reliable-timers/docker-compose.yml +++ b/samples/java-spring-reliable-timers/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-reliable-timers ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-shopping-cart-quickstart/docker-compose.yml b/samples/java-spring-shopping-cart-quickstart/docker-compose.yml index 5b4e2ee5e8..ec50e2c5a4 100644 --- a/samples/java-spring-shopping-cart-quickstart/docker-compose.yml +++ b/samples/java-spring-shopping-cart-quickstart/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-shopping-cart-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-tracing/docker-compose.yml b/samples/java-spring-tracing/docker-compose.yml index 07625fe410..43613dd050 100644 --- a/samples/java-spring-tracing/docker-compose.yml +++ b/samples/java-spring-tracing/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: tracing ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-transfer-workflow-compensation/docker-compose.yml b/samples/java-spring-transfer-workflow-compensation/docker-compose.yml index 0836292a64..9ffdddffe8 100644 --- a/samples/java-spring-transfer-workflow-compensation/docker-compose.yml +++ b/samples/java-spring-transfer-workflow-compensation/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-transfer-workflow-compensation ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-transfer-workflow/docker-compose.yml b/samples/java-spring-transfer-workflow/docker-compose.yml index 298ab46a48..7b12e6e183 100644 --- a/samples/java-spring-transfer-workflow/docker-compose.yml +++ b/samples/java-spring-transfer-workflow/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-transfer-workflow ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-valueentity-counter/docker-compose.yml b/samples/java-spring-valueentity-counter/docker-compose.yml index 168e0059a5..f91fbcf320 100644 --- a/samples/java-spring-valueentity-counter/docker-compose.yml +++ b/samples/java-spring-valueentity-counter/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-valueentity-counter ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-valueentity-customer-registry/docker-compose.yml b/samples/java-spring-valueentity-customer-registry/docker-compose.yml index cdb17e8f6f..a629beb1c8 100644 --- a/samples/java-spring-valueentity-customer-registry/docker-compose.yml +++ b/samples/java-spring-valueentity-customer-registry/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-valueentity-customer-registry ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-valueentity-shopping-cart/docker-compose.yml b/samples/java-spring-valueentity-shopping-cart/docker-compose.yml index c9cfd2b3ff..fd4a7591cb 100644 --- a/samples/java-spring-valueentity-shopping-cart/docker-compose.yml +++ b/samples/java-spring-valueentity-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-valueentity-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/java-spring-view-store/docker-compose.yml b/samples/java-spring-view-store/docker-compose.yml index 6211abded8..0a6893a90f 100644 --- a/samples/java-spring-view-store/docker-compose.yml +++ b/samples/java-spring-view-store/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: java-spring-view-store ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml b/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml index c02c095d8e..79fe0c0643 100644 --- a/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml +++ b/samples/scala-protobuf-customer-registry-quickstart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-customer-registry-quickstart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-doc-snippets/docker-compose.yml b/samples/scala-protobuf-doc-snippets/docker-compose.yml index 97423126c7..ef59c79a11 100644 --- a/samples/scala-protobuf-doc-snippets/docker-compose.yml +++ b/samples/scala-protobuf-doc-snippets/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 # uncomment volumes when persistence is enabled volumes: # <1> - ./target/kalix:/var/kalix diff --git a/samples/scala-protobuf-eventsourced-counter/docker-compose.yml b/samples/scala-protobuf-eventsourced-counter/docker-compose.yml index 3abbe6dca6..28a9e01407 100644 --- a/samples/scala-protobuf-eventsourced-counter/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-eventsourced-counter ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml index 7f0c9246a1..441da5ea55 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml +++ b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml @@ -5,7 +5,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-eventsourced-customer-registry-subscriber depends_on: - kalix-runtime-customer-registry @@ -21,7 +21,7 @@ services: USER_SERVICE_PORT: "8081" kalix-runtime-customer-registry: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-eventsourced-customer-registry ports: - "9000:9000" diff --git a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml index c88da0883e..3bfcbda497 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml @@ -3,7 +3,7 @@ services: # note the ports being different from other sample docker-compose files to allow this service to run # on the same local machine as the scala-protobuf-eventsourced-customer-registry kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-eventsourced-customer-registry-subscriber ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml b/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml index 7697730a33..8c40b4c496 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-eventsourced-customer-registry ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml b/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml index 1f6705e6c3..f8a9707056 100644 --- a/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/scala-protobuf-eventsourced-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-eventsourced-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-fibonacci-action/docker-compose.yml b/samples/scala-protobuf-fibonacci-action/docker-compose.yml index 8fdca5ae4f..9ab4d3b443 100644 --- a/samples/scala-protobuf-fibonacci-action/docker-compose.yml +++ b/samples/scala-protobuf-fibonacci-action/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-fibonacci-action ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-first-service/docker-compose.yml b/samples/scala-protobuf-first-service/docker-compose.yml index 440cced000..37b28b7fc9 100644 --- a/samples/scala-protobuf-first-service/docker-compose.yml +++ b/samples/scala-protobuf-first-service/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-first-service ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-reliable-timers/docker-compose.yml b/samples/scala-protobuf-reliable-timers/docker-compose.yml index 9e9aaf8237..b0230f773f 100644 --- a/samples/scala-protobuf-reliable-timers/docker-compose.yml +++ b/samples/scala-protobuf-reliable-timers/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-reliable-timers ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml b/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml index b4c286704c..829baed9ea 100644 --- a/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml +++ b/samples/scala-protobuf-replicatedentity-examples/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-replicatedentity-examples ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml b/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml index 8bd3838a17..9c7907db31 100644 --- a/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml +++ b/samples/scala-protobuf-replicatedentity-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-replicatedentity-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-tracing/docker-compose.yml b/samples/scala-protobuf-tracing/docker-compose.yml index c0da776a25..0fabac821c 100644 --- a/samples/scala-protobuf-tracing/docker-compose.yml +++ b/samples/scala-protobuf-tracing/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: tracing ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-transfer-workflow-compensation/docker-compose.yml b/samples/scala-protobuf-transfer-workflow-compensation/docker-compose.yml index d3734eb59c..0f57f31a9d 100644 --- a/samples/scala-protobuf-transfer-workflow-compensation/docker-compose.yml +++ b/samples/scala-protobuf-transfer-workflow-compensation/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-transfer-workflow-compensation ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-transfer-workflow/docker-compose.yml b/samples/scala-protobuf-transfer-workflow/docker-compose.yml index 1e2ce44902..c670dfb436 100644 --- a/samples/scala-protobuf-transfer-workflow/docker-compose.yml +++ b/samples/scala-protobuf-transfer-workflow/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-transfer-workflow ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-validated/docker-compose.yml b/samples/scala-protobuf-validated/docker-compose.yml index 8fdca5ae4f..9ab4d3b443 100644 --- a/samples/scala-protobuf-validated/docker-compose.yml +++ b/samples/scala-protobuf-validated/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-fibonacci-action ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-valueentity-counter/docker-compose.yml b/samples/scala-protobuf-valueentity-counter/docker-compose.yml index 6a7ddfca17..a6d8a3c843 100644 --- a/samples/scala-protobuf-valueentity-counter/docker-compose.yml +++ b/samples/scala-protobuf-valueentity-counter/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-valueentity-counter ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml b/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml index fefef37852..a0f5011d89 100644 --- a/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml +++ b/samples/scala-protobuf-valueentity-customer-registry/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-valueentity-customer-registry ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml b/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml index f92f442833..337c4047a3 100644 --- a/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml +++ b/samples/scala-protobuf-valueentity-shopping-cart/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-valueentity-shopping-cart ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-view-store/docker-compose.yml b/samples/scala-protobuf-view-store/docker-compose.yml index 8c89e8f9bd..5cdcaf4886 100644 --- a/samples/scala-protobuf-view-store/docker-compose.yml +++ b/samples/scala-protobuf-view-store/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-view-store ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/samples/scala-protobuf-web-resources/docker-compose.yml b/samples/scala-protobuf-web-resources/docker-compose.yml index f78f744b5d..eaa589345a 100644 --- a/samples/scala-protobuf-web-resources/docker-compose.yml +++ b/samples/scala-protobuf-web-resources/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 container_name: scala-protobuf-web-resources ports: - "${ADVERTISED_HTTP_PORT}:9000" diff --git a/sdk/java-sdk-protobuf-testkit/src/main/scala/kalix/javasdk/testkit/impl/EventingTestKitImpl.scala b/sdk/java-sdk-protobuf-testkit/src/main/scala/kalix/javasdk/testkit/impl/EventingTestKitImpl.scala index d2f077ad7b..df58b6b426 100644 --- a/sdk/java-sdk-protobuf-testkit/src/main/scala/kalix/javasdk/testkit/impl/EventingTestKitImpl.scala +++ b/sdk/java-sdk-protobuf-testkit/src/main/scala/kalix/javasdk/testkit/impl/EventingTestKitImpl.scala @@ -43,6 +43,7 @@ import kalix.eventing.DirectSource import kalix.eventing.EventSource import kalix.javasdk.JsonSupport import kalix.javasdk.Metadata.{ MetadataEntry => SdkMetadataEntry } +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.MessageCodec import kalix.javasdk.impl.MetadataImpl import kalix.javasdk.testkit.EventingTestKit @@ -354,7 +355,7 @@ private[testkit] class OutgoingMessagesImpl( val metadata = MetadataImpl.of(msg.getMessage.getMetadata.entries) val scalaPb = ScalaPbAny(typeUrlFor(metadata), msg.getMessage.payload) - val decodedMsg = if (typeUrlFor(metadata).startsWith(JsonSupport.KALIX_JSON)) { + val decodedMsg = if (AnySupport.isJsonTypeUrl(typeUrlFor(metadata))) { JsonSupport.getObjectMapper .readerFor(clazz) .readValue(msg.getMessage.payload.toByteArray) @@ -368,7 +369,7 @@ private[testkit] class OutgoingMessagesImpl( private def anyFromMessage(m: kalix.testkit.protocol.eventing_test_backend.Message): TestKitMessage[_] = { val metadata = MetadataImpl.of(m.metadata.getOrElse(Metadata.defaultInstance).entries) - val anyMsg = if (typeUrlFor(metadata).startsWith(JsonSupport.KALIX_JSON)) { + val anyMsg = if (AnySupport.isJsonTypeUrl(typeUrlFor(metadata))) { m.payload.toStringUtf8 } else { codec.decodeMessage(ScalaPbAny(typeUrlFor(metadata), m.payload)) @@ -438,7 +439,7 @@ private[testkit] object TestKitMessageImpl { case _: String => ("text/plain; charset=utf-8", "") case _ => - ("application/json", messageCodec.typeUrlFor(message.getClass).stripPrefix(JsonSupport.KALIX_JSON)) + ("application/json", AnySupport.stripJsonTypeUrlPrefix(messageCodec.typeUrlFor(message.getClass))) } defaultMetadata(subject, contentType, ceType) diff --git a/sdk/java-sdk-protobuf/src/main/java/kalix/javasdk/JsonSupport.java b/sdk/java-sdk-protobuf/src/main/java/kalix/javasdk/JsonSupport.java index 6d3f8513b1..69d6ace2bb 100644 --- a/sdk/java-sdk-protobuf/src/main/java/kalix/javasdk/JsonSupport.java +++ b/sdk/java-sdk-protobuf/src/main/java/kalix/javasdk/JsonSupport.java @@ -26,6 +26,7 @@ import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; import kalix.javasdk.annotations.Migration; +import kalix.javasdk.impl.AnySupport; import kalix.javasdk.impl.ByteStringEncoding; import java.io.IOException; @@ -35,7 +36,7 @@ public final class JsonSupport { - public static final String KALIX_JSON = "json.kalix.io/"; + public static final String KALIX_JSON = AnySupport.KalixJsonTypeUrlPrefix(); private static final ObjectMapper objectMapper = new ObjectMapper(); @@ -132,13 +133,13 @@ public static ByteString encodeToBytes(T value) throws JsonProcessingExcepti * @throws IllegalArgumentException if the given value cannot be decoded to a T */ public static T decodeJson(Class valueClass, Any any) { - if (!any.getTypeUrl().startsWith(KALIX_JSON)) { + if (!(AnySupport.isJsonTypeUrl(any.getTypeUrl()))) { throw new IllegalArgumentException( "Protobuf bytes with type url [" + any.getTypeUrl() + "] cannot be decoded as JSON, must start with [" + KALIX_JSON - + "]"); + + "] or [" + AnySupport.AkkaJsonTypeUrlPrefix() + "]"); } else { try { ByteString decodedBytes = ByteStringEncoding.decodePrimitiveBytes(any.getValue()); @@ -213,12 +214,14 @@ private static int parseVersion(String typeUrl) { } public static > C decodeJsonCollection(Class valueClass, Class collectionType, Any any) { - if (!any.getTypeUrl().startsWith(KALIX_JSON)) { + if (!(AnySupport.isJsonTypeUrl(any.getTypeUrl()))) { throw new IllegalArgumentException( "Protobuf bytes with type url [" + any.getTypeUrl() + "] cannot be decoded as JSON, must start with [" + KALIX_JSON + + "] or [" + + AnySupport.AkkaJsonTypeUrlPrefix() + "]"); } else { try { diff --git a/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/AnySupport.scala b/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/AnySupport.scala index 90386488e8..6150105f10 100644 --- a/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/AnySupport.scala +++ b/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/AnySupport.scala @@ -20,7 +20,6 @@ import com.google.protobuf.UnsafeByteOperations import com.google.protobuf.WireFormat import com.google.protobuf.any.{ Any => ScalaPbAny } import com.google.protobuf.{ Any => JavaPbAny } -import kalix.javasdk.JsonSupport import kalix.javasdk.impl.AnySupport.Prefer.Java import kalix.javasdk.impl.AnySupport.Prefer.Scala import kalix.javasdk.impl.ErrorHandling.BadRequestException @@ -33,6 +32,9 @@ import scala.collection.compat.immutable.ArraySeq object AnySupport { + val KalixJsonTypeUrlPrefix = "json.kalix.io/" + val AkkaJsonTypeUrlPrefix = "json.akka.io/" + private final val KalixPrimitiveFieldNumber = 1 final val KalixPrimitive = "type.kalix.io/" final val DefaultTypeUrlPrefix = "type.googleapis.com" @@ -40,6 +42,16 @@ object AnySupport { private val log = LoggerFactory.getLogger(classOf[AnySupport]) + def isJsonTypeUrl(typeUrl: String): Boolean = + typeUrl.startsWith(KalixJsonTypeUrlPrefix) || typeUrl.startsWith(AkkaJsonTypeUrlPrefix) + + def stripJsonTypeUrlPrefix(typeUrl: String): String = + typeUrl.stripPrefix(AkkaJsonTypeUrlPrefix).stripPrefix(KalixJsonTypeUrlPrefix) + + def replaceAkkaJsonPrefix(typeUrl: String): String = + if (typeUrl.startsWith(AkkaJsonTypeUrlPrefix)) KalixJsonTypeUrlPrefix + typeUrl.stripPrefix(AkkaJsonTypeUrlPrefix) + else typeUrl + sealed abstract class Primitive[T: ClassTag] { val name: String = fieldType.name().toLowerCase(Locale.ROOT) val fullName: String = KalixPrimitive + name @@ -420,7 +432,7 @@ class AnySupport( else com.google.protobuf.wrappers.StringValue.of(string) - } else if (typeUrl.startsWith(JsonSupport.KALIX_JSON)) { + } else if (isJsonTypeUrl(typeUrl)) { // we do not actually parse JSON here but returns it as is and let the user // decide which json type to try decode it into etc. based on the type_url which // may have additional detail about what it can be JSON-deserialized into diff --git a/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/workflow/WorkflowRouter.scala b/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/workflow/WorkflowRouter.scala index cd6efb56e9..6aa95454e3 100644 --- a/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/workflow/WorkflowRouter.scala +++ b/sdk/java-sdk-protobuf/src/main/scala/kalix/javasdk/impl/workflow/WorkflowRouter.scala @@ -8,20 +8,18 @@ import java.nio.ByteBuffer import java.util.Optional import java.util.concurrent.CompletionStage import java.util.function.{ Function => JFunc } - import scala.compat.java8.FutureConverters.CompletionStageOps import scala.concurrent.ExecutionContext import scala.concurrent.Future import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters.RichOptional - import com.google.api.HttpBody import com.google.protobuf.any.{ Any => ScalaPbAny } import kalix.javasdk.DeferredCall import kalix.javasdk.HttpResponse import kalix.javasdk.HttpResponse.STATUS_CODE_EXTENSION_TYPE_URL -import kalix.javasdk.JsonSupport import kalix.javasdk.StatusCode +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.GrpcDeferredCall import kalix.javasdk.impl.MessageCodec import kalix.javasdk.impl.MetadataImpl @@ -124,7 +122,7 @@ abstract class WorkflowRouter[S, W <: AbstractWorkflow[S]](protected val workflo // in same cases, the Proxy may send a message with typeUrl set to object. // if that's the case, we need to patch the message using the typeUrl from the expected input class private def decodeInput(messageCodec: MessageCodec, result: ScalaPbAny, expectedInputClass: Class[_]) = { - if (result.typeUrl == JsonSupport.KALIX_JSON + "object") { + if (AnySupport.isJsonTypeUrl(result.typeUrl) && result.typeUrl.endsWith("object")) { val typeUrl = messageCodec.typeUrlFor(expectedInputClass) messageCodec.decodeMessage(result.copy(typeUrl = typeUrl)) } else if (result.typeUrl == "type.googleapis.com/google.api.HttpBody") { diff --git a/sdk/java-sdk-spring/docker-compose-integration.yml b/sdk/java-sdk-spring/docker-compose-integration.yml index 6d72ebf187..b94c3566b8 100644 --- a/sdk/java-sdk-spring/docker-compose-integration.yml +++ b/sdk/java-sdk-spring/docker-compose-integration.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.46 + image: gcr.io/kalix-public/kalix-runtime:1.2.0 ports: - "9000:9000" extra_hosts: diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/InvocationContext.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/InvocationContext.scala index 1a92df98d5..30012a2789 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/InvocationContext.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/InvocationContext.scala @@ -7,7 +7,6 @@ package kalix.javasdk.impl import com.google.protobuf.Descriptors import com.google.protobuf.DynamicMessage import com.google.protobuf.any.{ Any => ScalaPbAny } -import kalix.javasdk.JsonSupport import kalix.javasdk.Metadata import kalix.javasdk.impl.AnySupport.BytesPrimitive import kalix.javasdk.impl.reflection.DynamicMessageContext @@ -24,7 +23,7 @@ object InvocationContext { metadata: Metadata = Metadata.EMPTY): InvocationContext = { val dynamicMessage = - if (anyMessage.typeUrl.startsWith(JsonSupport.KALIX_JSON) || + if (AnySupport.isJsonTypeUrl(anyMessage.typeUrl) || anyMessage.typeUrl == BytesPrimitive.fullName) { DynamicMessage .newBuilder(methodDescriptor) diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/JsonMessageCodec.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/JsonMessageCodec.scala index 1ae9f508b6..2b11186174 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/JsonMessageCodec.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/JsonMessageCodec.scala @@ -185,9 +185,9 @@ private[kalix] class JsonMessageCodec extends MessageCodec { private[kalix] class StrictJsonMessageCodec(delegate: JsonMessageCodec) extends MessageCodec { override def decodeMessage(value: ScalaPbAny): Any = - if (value.typeUrl.startsWith(JsonSupport.KALIX_JSON)) { + if (AnySupport.isJsonTypeUrl(value.typeUrl)) { val any = ScalaPbAny.toJavaProto(value) - val typeName = delegate.removeVersion(value.typeUrl.replace(JsonSupport.KALIX_JSON, "")) + val typeName = delegate.removeVersion(AnySupport.stripJsonTypeUrlPrefix(value.typeUrl)) val typeClass = delegate.reversedTypeHints.get(typeName) if (typeClass == null) { throw new IllegalStateException(s"Cannot decode ${value.typeUrl} message type. Class mapping not found.") diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/action/ReflectiveActionRouter.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/action/ReflectiveActionRouter.scala index 497906636d..37e87ace34 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/action/ReflectiveActionRouter.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/action/ReflectiveActionRouter.scala @@ -6,11 +6,12 @@ package kalix.javasdk.impl.action import akka.NotUsed import akka.stream.javadsl.Source -import com.google.protobuf.any.{ Any => ScalaPbAny } -import kalix.javasdk.action.{ Action, MessageEnvelope } +import com.google.protobuf.any.{Any => ScalaPbAny} +import kalix.javasdk.action.{Action, MessageEnvelope} +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.AnySupport.ProtobufEmptyTypeUrl import kalix.javasdk.impl.reflection.Reflect -import kalix.javasdk.impl.{ CommandHandler, InvocationContext } +import kalix.javasdk.impl.{CommandHandler, InvocationContext} // TODO: abstract away reactor dependency import reactor.core.publisher.Flux @@ -34,7 +35,7 @@ class ReflectiveActionRouter[A <: Action]( commandHandler.requestMessageDescriptor, message.metadata()) - val inputTypeUrl = message.payload().asInstanceOf[ScalaPbAny].typeUrl + val inputTypeUrl = AnySupport.replaceAkkaJsonPrefix(message.payload().asInstanceOf[ScalaPbAny].typeUrl) val methodInvoker = commandHandler.lookupInvoker(inputTypeUrl) // lookup ComponentClient @@ -79,7 +80,7 @@ class ReflectiveActionRouter[A <: Action]( componentMethod.requestMessageDescriptor, message.metadata()) - val inputTypeUrl = message.payload().asInstanceOf[ScalaPbAny].typeUrl + val inputTypeUrl = AnySupport.replaceAkkaJsonPrefix(message.payload().asInstanceOf[ScalaPbAny].typeUrl) componentMethod.lookupInvoker(inputTypeUrl) match { case Some(methodInvoker) => val response = methodInvoker.invoke(action, context).asInstanceOf[Flux[Action.Effect[_]]] diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/eventsourcedentity/ReflectiveEventSourcedEntityRouter.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/eventsourcedentity/ReflectiveEventSourcedEntityRouter.scala index da49110b77..c6e91d55d1 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/eventsourcedentity/ReflectiveEventSourcedEntityRouter.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/eventsourcedentity/ReflectiveEventSourcedEntityRouter.scala @@ -4,11 +4,12 @@ package kalix.javasdk.impl.eventsourcedentity -import com.google.protobuf.any.{ Any => ScalaPbAny } -import com.google.protobuf.{ Any => JavaPbAny } +import com.google.protobuf.any.{Any => ScalaPbAny} +import com.google.protobuf.{Any => JavaPbAny} import kalix.javasdk.JsonSupport import kalix.javasdk.eventsourcedentity.CommandContext import kalix.javasdk.eventsourcedentity.EventSourcedEntity +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.CommandHandler import kalix.javasdk.impl.InvocationContext import kalix.javasdk.impl.JsonMessageCodec @@ -70,7 +71,7 @@ class ReflectiveEventSourcedEntityRouter[S, E, ES <: EventSourcedEntity[S, E]]( commandHandler.requestMessageDescriptor, commandContext.metadata()) - val inputTypeUrl = command.asInstanceOf[ScalaPbAny].typeUrl + val inputTypeUrl = AnySupport.replaceAkkaJsonPrefix(command.asInstanceOf[ScalaPbAny].typeUrl) val methodInvoker = commandHandler .getInvoker(inputTypeUrl) diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/valueentity/ReflectiveValueEntityRouter.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/valueentity/ReflectiveValueEntityRouter.scala index f2a3a72309..2823e69fff 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/valueentity/ReflectiveValueEntityRouter.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/valueentity/ReflectiveValueEntityRouter.scala @@ -5,9 +5,9 @@ package kalix.javasdk.impl.valueentity import java.lang.reflect.ParameterizedType - -import com.google.protobuf.any.{ Any => ScalaPbAny } +import com.google.protobuf.any.{Any => ScalaPbAny} import kalix.javasdk.JsonSupport +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.CommandHandler import kalix.javasdk.impl.InvocationContext import kalix.javasdk.valueentity.CommandContext @@ -36,7 +36,7 @@ class ReflectiveValueEntityRouter[S, E <: ValueEntity[S]]( commandHandler.requestMessageDescriptor, commandContext.metadata()) - val inputTypeUrl = command.asInstanceOf[ScalaPbAny].typeUrl + val inputTypeUrl = AnySupport.replaceAkkaJsonPrefix(command.asInstanceOf[ScalaPbAny].typeUrl) commandHandler .getInvoker(inputTypeUrl) diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/view/ReflectiveViewRouter.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/view/ReflectiveViewRouter.scala index 7090c1dda7..2494242021 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/view/ReflectiveViewRouter.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/view/ReflectiveViewRouter.scala @@ -6,11 +6,10 @@ package kalix.javasdk.impl.view import java.lang.reflect.ParameterizedType import java.util.{ Map => JMap } - import scala.jdk.CollectionConverters._ - import com.google.protobuf.any.{ Any => ScalaPbAny } import kalix.javasdk.JsonSupport +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.AnySupport.ProtobufEmptyTypeUrl import kalix.javasdk.impl.CommandHandler import kalix.javasdk.impl.ComponentDescriptorFactory @@ -51,7 +50,7 @@ class ReflectiveViewRouter[S, V <: View[S]]( val commandHandler = commandHandlerLookup(commandName) val anyEvent = event.asInstanceOf[ScalaPbAny] - val inputTypeUrl = anyEvent.typeUrl + val inputTypeUrl = AnySupport.replaceAkkaJsonPrefix(anyEvent.typeUrl) val methodInvoker = commandHandler.lookupInvoker(inputTypeUrl) methodInvoker match { diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/workflow/ReflectiveWorkflowRouter.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/workflow/ReflectiveWorkflowRouter.scala index c5b8068343..310ac93652 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/workflow/ReflectiveWorkflowRouter.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/workflow/ReflectiveWorkflowRouter.scala @@ -4,7 +4,8 @@ package kalix.javasdk.impl.workflow -import com.google.protobuf.any.{ Any => ScalaPbAny } +import com.google.protobuf.any.{Any => ScalaPbAny} +import kalix.javasdk.impl.AnySupport import kalix.javasdk.impl.CommandHandler import kalix.javasdk.impl.InvocationContext import kalix.javasdk.workflow.AbstractWorkflow @@ -36,7 +37,7 @@ class ReflectiveWorkflowRouter[S, W <: Workflow[S]]( commandHandler.requestMessageDescriptor, commandContext.metadata()) - val inputTypeUrl = command.asInstanceOf[ScalaPbAny].typeUrl + val inputTypeUrl = AnySupport.replaceAkkaJsonPrefix(command.asInstanceOf[ScalaPbAny].typeUrl) commandHandler .getInvoker(inputTypeUrl)