From e486d35fbc9d0452240cbd0f2804a3fdd4710820 Mon Sep 17 00:00:00 2001 From: Andrzej Ludwikowski Date: Mon, 26 Jun 2023 08:51:31 +0200 Subject: [PATCH] moving component client to public package --- .../javasdk/client/ActionCallBuilder.java | 21 ------------------- .../client/EventSourcedEntityCallBuilder.java | 21 ------------------- .../client/ValueEntityCallBuilder.java | 21 ------------------- .../javasdk/client/WorkflowCallBuilder.java | 21 ------------------- .../{impl => }/client/ComponentCall.scala | 3 ++- .../impl/client/MethodRefResolver.scala | 2 +- 6 files changed, 3 insertions(+), 86 deletions(-) rename sdk/java-sdk-spring/src/main/scala/kalix/javasdk/{impl => }/client/ComponentCall.scala (99%) diff --git a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ActionCallBuilder.java b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ActionCallBuilder.java index 40320a6f26..06d1edd8fe 100644 --- a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ActionCallBuilder.java +++ b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ActionCallBuilder.java @@ -41,27 +41,6 @@ import com.google.protobuf.any.Any; import kalix.javasdk.DeferredCall; import kalix.javasdk.action.Action; -import kalix.javasdk.impl.client.ComponentCall; -import kalix.javasdk.impl.client.ComponentCall10; -import kalix.javasdk.impl.client.ComponentCall11; -import kalix.javasdk.impl.client.ComponentCall12; -import kalix.javasdk.impl.client.ComponentCall13; -import kalix.javasdk.impl.client.ComponentCall14; -import kalix.javasdk.impl.client.ComponentCall15; -import kalix.javasdk.impl.client.ComponentCall16; -import kalix.javasdk.impl.client.ComponentCall17; -import kalix.javasdk.impl.client.ComponentCall18; -import kalix.javasdk.impl.client.ComponentCall19; -import kalix.javasdk.impl.client.ComponentCall2; -import kalix.javasdk.impl.client.ComponentCall20; -import kalix.javasdk.impl.client.ComponentCall21; -import kalix.javasdk.impl.client.ComponentCall3; -import kalix.javasdk.impl.client.ComponentCall4; -import kalix.javasdk.impl.client.ComponentCall5; -import kalix.javasdk.impl.client.ComponentCall6; -import kalix.javasdk.impl.client.ComponentCall7; -import kalix.javasdk.impl.client.ComponentCall8; -import kalix.javasdk.impl.client.ComponentCall9; import kalix.spring.KalixClient; import java.util.Optional; diff --git a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/EventSourcedEntityCallBuilder.java b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/EventSourcedEntityCallBuilder.java index 789fd39c8f..15e02853d3 100644 --- a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/EventSourcedEntityCallBuilder.java +++ b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/EventSourcedEntityCallBuilder.java @@ -41,27 +41,6 @@ import com.google.protobuf.any.Any; import kalix.javasdk.DeferredCall; import kalix.javasdk.eventsourcedentity.EventSourcedEntity; -import kalix.javasdk.impl.client.ComponentCall; -import kalix.javasdk.impl.client.ComponentCall10; -import kalix.javasdk.impl.client.ComponentCall11; -import kalix.javasdk.impl.client.ComponentCall12; -import kalix.javasdk.impl.client.ComponentCall13; -import kalix.javasdk.impl.client.ComponentCall14; -import kalix.javasdk.impl.client.ComponentCall15; -import kalix.javasdk.impl.client.ComponentCall16; -import kalix.javasdk.impl.client.ComponentCall17; -import kalix.javasdk.impl.client.ComponentCall18; -import kalix.javasdk.impl.client.ComponentCall19; -import kalix.javasdk.impl.client.ComponentCall2; -import kalix.javasdk.impl.client.ComponentCall20; -import kalix.javasdk.impl.client.ComponentCall21; -import kalix.javasdk.impl.client.ComponentCall3; -import kalix.javasdk.impl.client.ComponentCall4; -import kalix.javasdk.impl.client.ComponentCall5; -import kalix.javasdk.impl.client.ComponentCall6; -import kalix.javasdk.impl.client.ComponentCall7; -import kalix.javasdk.impl.client.ComponentCall8; -import kalix.javasdk.impl.client.ComponentCall9; import kalix.spring.KalixClient; import java.util.Optional; diff --git a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ValueEntityCallBuilder.java b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ValueEntityCallBuilder.java index 63c64ccb1e..44173268a6 100644 --- a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ValueEntityCallBuilder.java +++ b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/ValueEntityCallBuilder.java @@ -40,27 +40,6 @@ import akka.japi.function.Function9; import com.google.protobuf.any.Any; import kalix.javasdk.DeferredCall; -import kalix.javasdk.impl.client.ComponentCall; -import kalix.javasdk.impl.client.ComponentCall10; -import kalix.javasdk.impl.client.ComponentCall11; -import kalix.javasdk.impl.client.ComponentCall12; -import kalix.javasdk.impl.client.ComponentCall13; -import kalix.javasdk.impl.client.ComponentCall14; -import kalix.javasdk.impl.client.ComponentCall15; -import kalix.javasdk.impl.client.ComponentCall16; -import kalix.javasdk.impl.client.ComponentCall17; -import kalix.javasdk.impl.client.ComponentCall18; -import kalix.javasdk.impl.client.ComponentCall19; -import kalix.javasdk.impl.client.ComponentCall2; -import kalix.javasdk.impl.client.ComponentCall20; -import kalix.javasdk.impl.client.ComponentCall21; -import kalix.javasdk.impl.client.ComponentCall3; -import kalix.javasdk.impl.client.ComponentCall4; -import kalix.javasdk.impl.client.ComponentCall5; -import kalix.javasdk.impl.client.ComponentCall6; -import kalix.javasdk.impl.client.ComponentCall7; -import kalix.javasdk.impl.client.ComponentCall8; -import kalix.javasdk.impl.client.ComponentCall9; import kalix.javasdk.valueentity.ValueEntity; import kalix.spring.KalixClient; diff --git a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/WorkflowCallBuilder.java b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/WorkflowCallBuilder.java index 099e7ebb79..68e8649c12 100644 --- a/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/WorkflowCallBuilder.java +++ b/sdk/java-sdk-spring/src/main/java/kalix/javasdk/client/WorkflowCallBuilder.java @@ -40,27 +40,6 @@ import akka.japi.function.Function9; import com.google.protobuf.any.Any; import kalix.javasdk.DeferredCall; -import kalix.javasdk.impl.client.ComponentCall; -import kalix.javasdk.impl.client.ComponentCall10; -import kalix.javasdk.impl.client.ComponentCall11; -import kalix.javasdk.impl.client.ComponentCall12; -import kalix.javasdk.impl.client.ComponentCall13; -import kalix.javasdk.impl.client.ComponentCall14; -import kalix.javasdk.impl.client.ComponentCall15; -import kalix.javasdk.impl.client.ComponentCall16; -import kalix.javasdk.impl.client.ComponentCall17; -import kalix.javasdk.impl.client.ComponentCall18; -import kalix.javasdk.impl.client.ComponentCall19; -import kalix.javasdk.impl.client.ComponentCall2; -import kalix.javasdk.impl.client.ComponentCall20; -import kalix.javasdk.impl.client.ComponentCall21; -import kalix.javasdk.impl.client.ComponentCall3; -import kalix.javasdk.impl.client.ComponentCall4; -import kalix.javasdk.impl.client.ComponentCall5; -import kalix.javasdk.impl.client.ComponentCall6; -import kalix.javasdk.impl.client.ComponentCall7; -import kalix.javasdk.impl.client.ComponentCall8; -import kalix.javasdk.impl.client.ComponentCall9; import kalix.javasdk.workflow.Workflow; import kalix.spring.KalixClient; diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/ComponentCall.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/client/ComponentCall.scala similarity index 99% rename from sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/ComponentCall.scala rename to sdk/java-sdk-spring/src/main/scala/kalix/javasdk/client/ComponentCall.scala index d39fda2975..4caca6c8c7 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/ComponentCall.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/client/ComponentCall.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package kalix.javasdk.impl.client +package kalix.javasdk.client import java.lang.reflect.Method import java.lang.reflect.ParameterizedType @@ -28,6 +28,7 @@ import com.google.protobuf.any.Any import kalix.javasdk.DeferredCall import kalix.javasdk.annotations.EntityType import kalix.javasdk.annotations.TypeId +import kalix.javasdk.impl.client.MethodRefResolver import kalix.javasdk.impl.reflection.IdExtractor import kalix.javasdk.impl.reflection.RestServiceIntrospector import kalix.javasdk.impl.reflection.RestServiceIntrospector.BodyParameter diff --git a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/MethodRefResolver.scala b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/MethodRefResolver.scala index b42491fcc7..8a35c4d820 100644 --- a/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/MethodRefResolver.scala +++ b/sdk/java-sdk-spring/src/main/scala/kalix/javasdk/impl/client/MethodRefResolver.scala @@ -19,7 +19,7 @@ package kalix.javasdk.impl.client import java.lang.invoke.SerializedLambda import java.lang.reflect.Method -private object MethodRefResolver { +private[kalix] object MethodRefResolver { /** * Resolve the method ref for a lambda.