rename: use 'type.kalix.io' for primitive types (#891)

octonato · patriknw · web-flow · commit 5702db414d7e · 2022-04-01T10:09:43.000+02:00
* rename: use 'type.kalix.io' for primitive types
* bump: kalix-proxy 1.0.0-M2
* update ProtocolVersionMajor and ProtocolVersionMinor

Co-authored-by: Patrik Nordwall &lt;patrik.nordwall@gmail.com&gt;
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
@@ -2,7 +2,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000: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
@@ -2,7 +2,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M3
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,9 +3,9 @@ import sbt.Keys._
 
 object Dependencies {
   object Kalix {
-    val ProtocolVersionMajor = 0
-    val ProtocolVersionMinor = 10
-    val ProxyVersion = "0.10.0-M4"
+    val ProtocolVersionMajor = 1
+    val ProtocolVersionMinor = 0
+    val ProxyVersion = "1.0.0-M2"
   }
 
   // changing the Scala version of the Java SDK affects end users
diff --git a/samples/java-customer-registry-kafka-quickstart/docker-compose.yml b/samples/java-customer-registry-kafka-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-customer-registry-kafka-quickstart/kafka/docker-compose.yml b/samples/java-customer-registry-kafka-quickstart/kafka/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=kafka
     ports:
       - "9000:9000"
@@ -26,4 +26,4 @@ services:
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
-      - "2181:2181"
+      - "2181:2181"
diff --git a/samples/java-customer-registry-quickstart/docker-compose.yml b/samples/java-customer-registry-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-customer-registry-views-quickstart/docker-compose.yml b/samples/java-customer-registry-views-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-eventsourced-counter/docker-compose.yml b/samples/java-eventsourced-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-eventsourced-shopping-cart/docker-compose.yml b/samples/java-eventsourced-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-fibonacci-action/docker-compose.yml b/samples/java-fibonacci-action/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-first-service/docker-compose.yml b/samples/java-first-service/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-replicatedentity-examples/docker-compose.yml b/samples/java-replicatedentity-examples/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-replicatedentity-shopping-cart/docker-compose.yml b/samples/java-replicatedentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-shopping-cart-quickstart/docker-compose.yml b/samples/java-shopping-cart-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-valueentity-counter/docker-compose.yml b/samples/java-valueentity-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-valueentity-customer-registry/docker-compose.yml b/samples/java-valueentity-customer-registry/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-valueentity-shopping-cart/docker-compose.yml b/samples/java-valueentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-customer-registry-quickstart/docker-compose.yml b/samples/scala-customer-registry-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-eventsourced-counter/docker-compose.yml b/samples/scala-eventsourced-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-eventsourced-customer-registry/docker-compose.yml b/samples/scala-eventsourced-customer-registry/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-eventsourced-shopping-cart/docker-compose.yml b/samples/scala-eventsourced-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-fibonacci-action/docker-compose.yml b/samples/scala-fibonacci-action/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-first-service/docker-compose.yml b/samples/scala-first-service/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-replicatedentity-examples/docker-compose.yml b/samples/scala-replicatedentity-examples/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-replicatedentity-shopping-cart/docker-compose.yml b/samples/scala-replicatedentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-valueentity-counter/docker-compose.yml b/samples/scala-valueentity-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-valueentity-customer-registry/docker-compose.yml b/samples/scala-valueentity-customer-registry/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-valueentity-shopping-cart/docker-compose.yml b/samples/scala-valueentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4
+    image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2
     command: -Dconfig.resource=dev-mode.conf -Dkalix.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/sdk/java-sdk/src/main/scala/kalix/javasdk/impl/AnySupport.scala b/sdk/java-sdk/src/main/scala/kalix/javasdk/impl/AnySupport.scala
@@ -45,7 +45,7 @@ import scalapb.options.Scalapb
 object AnySupport {
 
   private final val KalixPrimitiveFieldNumber = 1
-  final val KalixPrimitive = "p.kalix.io/"
+  final val KalixPrimitive = "type.kalix.io/"
   final val DefaultTypeUrlPrefix = "type.googleapis.com"
 
   private val log = LoggerFactory.getLogger(classOf[AnySupport])
diff --git a/sdk/java-sdk/src/test/scala/kalix/javasdk/impl/AnySupportSpec.scala b/sdk/java-sdk/src/test/scala/kalix/javasdk/impl/AnySupportSpec.scala
@@ -120,7 +120,7 @@ class AnySupportSpec extends AnyWordSpec with Matchers with OptionValues {
     "deserialize text into StringValue" in {
       val plainText = "some text"
       val any =
-        ScalaPbAny("p.kalix.io/string", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(plainText)))
+        ScalaPbAny("type.kalix.io/string", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(plainText)))
       // both as top level message
       val decoded = anySupport.decodeMessage(any)
       decoded shouldBe a[com.google.protobuf.StringValue]
@@ -132,7 +132,7 @@ class AnySupportSpec extends AnyWordSpec with Matchers with OptionValues {
     "deserialize bytes into BytesValue" in {
       val bytes = "some texty bytes"
       val any =
-        ScalaPbAny("p.kalix.io/bytes", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(bytes)))
+        ScalaPbAny("type.kalix.io/bytes", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(bytes)))
       // both as top level message
       val decoded = anySupport.decodeMessage(any)
       decoded shouldBe a[com.google.protobuf.BytesValue]
@@ -181,7 +181,7 @@ class AnySupportSpec extends AnyWordSpec with Matchers with OptionValues {
     "deserialize text into StringValue" in {
       val plainText = "some text"
       val any =
-        ScalaPbAny("p.kalix.io/string", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(plainText)))
+        ScalaPbAny("type.kalix.io/string", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(plainText)))
       // both as top level message
       val decoded = anySupportScala.decodeMessage(any)
       decoded shouldBe a[com.google.protobuf.wrappers.StringValue]
@@ -193,7 +193,7 @@ class AnySupportSpec extends AnyWordSpec with Matchers with OptionValues {
     "deserialize bytes into BytesValue" in {
       val bytes = "some texty bytes"
       val any =
-        ScalaPbAny("p.kalix.io/bytes", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(bytes)))
+        ScalaPbAny("type.kalix.io/bytes", AnySupport.encodePrimitiveBytes(ByteString.copyFromUtf8(bytes)))
       // both as top level message
       val decoded = anySupportScala.decodeMessage(any)
       decoded shouldBe a[com.google.protobuf.wrappers.BytesValue]
diff --git a/sdk/java-sdk/src/test/scala/kalix/testkit/entity/EntityMessages.scala b/sdk/java-sdk/src/test/scala/kalix/testkit/entity/EntityMessages.scala
@@ -78,10 +78,10 @@ trait EntityMessages {
   }
 
   def primitiveString(value: String): ScalaPbAny =
-    ScalaPbAny("p.kalix.io/string", StringValue.of(value).toByteString)
+    ScalaPbAny("type.kalix.io/string", StringValue.of(value).toByteString)
 
   def readPrimitiveString(any: ScalaPbAny): String =
-    if (any.typeUrl == "p.kalix.io/string") {
+    if (any.typeUrl == "type.kalix.io/string") {
       val stream = any.value.newCodedInput
       stream.readTag // assume it's for string
       stream.readString
