diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/DaprActorsIT.java similarity index 98% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/DaprActorsIT.java index 6416d4efd6..ba8cec619c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/DaprActorsIT.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.actors; import io.dapr.actors.ActorId; import io.dapr.actors.client.ActorClient; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActor.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActor.java similarity index 94% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActor.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActor.java index c5457fa551..976aeba701 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActor.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActor.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.actors; import io.dapr.actors.ActorMethod; import io.dapr.actors.ActorType; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActorImpl.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActorImpl.java similarity index 95% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActorImpl.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActorImpl.java index c171642992..a6ae49b2a6 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActorImpl.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActorImpl.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.actors; import io.dapr.actors.ActorId; import io.dapr.actors.runtime.AbstractActor; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActorsApplication.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActorsApplication.java similarity index 96% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActorsApplication.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActorsApplication.java index e556462189..dc50995bd3 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestActorsApplication.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestActorsApplication.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.actors; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprActorsConfiguration.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestDaprActorsConfiguration.java similarity index 97% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprActorsConfiguration.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestDaprActorsConfiguration.java index 23f2cf2e0c..fff41fa47f 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprActorsConfiguration.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestDaprActorsConfiguration.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.actors; import java.util.Map; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprConversationIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java similarity index 98% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprConversationIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java index 013a5cdf0e..2301e6fc36 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprConversationIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java @@ -11,12 +11,13 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.conversations; import io.dapr.client.DaprPreviewClient; import io.dapr.client.domain.ConversationInput; import io.dapr.client.domain.ConversationRequest; import io.dapr.client.domain.ConversationResponse; +import io.dapr.it.testcontainers.DaprPreviewClientConfiguration; import io.dapr.testcontainers.Component; import io.dapr.testcontainers.DaprContainer; import io.dapr.testcontainers.DaprLogLevel; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestConversationApplication.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/TestConversationApplication.java similarity index 94% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestConversationApplication.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/TestConversationApplication.java index 2bb9eeac10..041f13c6a0 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestConversationApplication.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/TestConversationApplication.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.conversations; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprContainerIT.java similarity index 99% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprContainerIT.java index 2bebdae7e4..c6c18a12a8 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprContainerIT.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.core; import com.github.tomakehurst.wiremock.junit5.WireMockTest; import io.dapr.client.DaprClient; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprPlacementContainerIT.java similarity index 97% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprPlacementContainerIT.java index fd7b78ffd2..ce817da985 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprPlacementContainerIT.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.core; import io.dapr.testcontainers.DaprPlacementContainer; import org.junit.jupiter.api.Tag; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprSchedulerContainerIT.java similarity index 97% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprSchedulerContainerIT.java index 682bd9a27e..8bcc54dfe2 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/core/DaprSchedulerContainerIT.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.core; import io.dapr.testcontainers.DaprSchedulerContainer; import org.junit.jupiter.api.Tag; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java similarity index 98% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java index 5b52c0267b..b1cc13493c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.jobs; import io.dapr.client.DaprPreviewClient; import io.dapr.client.domain.DeleteJobRequest; @@ -19,6 +19,7 @@ import io.dapr.client.domain.GetJobResponse; import io.dapr.client.domain.JobSchedule; import io.dapr.client.domain.ScheduleJobRequest; +import io.dapr.it.testcontainers.DaprPreviewClientConfiguration; import io.dapr.testcontainers.DaprContainer; import io.dapr.testcontainers.DaprLogLevel; import org.junit.jupiter.api.BeforeEach; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestJobsApplication.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/TestJobsApplication.java similarity index 95% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestJobsApplication.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/TestJobsApplication.java index 61ddaea792..c0f3fbb596 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestJobsApplication.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/TestJobsApplication.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.jobs; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/DaprWorkflowsIT.java similarity index 98% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/DaprWorkflowsIT.java index 5c6a360c8a..5b019f8315 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/DaprWorkflowsIT.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -46,7 +46,7 @@ @SpringBootTest( webEnvironment = WebEnvironment.RANDOM_PORT, classes = { - TestDaprWorkflowsConfiguration.class, + TestWorkflowsConfiguration.class, TestWorkflowsApplication.class } ) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/FirstActivity.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/FirstActivity.java similarity index 95% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/FirstActivity.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/FirstActivity.java index e4727474c8..52e459345d 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/FirstActivity.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/FirstActivity.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import io.dapr.workflows.WorkflowActivity; import io.dapr.workflows.WorkflowActivityContext; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/SecondActivity.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/SecondActivity.java similarity index 95% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/SecondActivity.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/SecondActivity.java index 30e70b75b3..7d12df06e9 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/SecondActivity.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/SecondActivity.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import io.dapr.workflows.WorkflowActivity; import io.dapr.workflows.WorkflowActivityContext; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflow.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflow.java similarity index 97% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflow.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflow.java index e3b03543ea..602bf8f8a5 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflow.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflow.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import io.dapr.workflows.Workflow; import io.dapr.workflows.WorkflowStub; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflowPayload.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowPayload.java similarity index 96% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflowPayload.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowPayload.java index 38e9e7f96f..f58f82ca40 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflowPayload.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowPayload.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import java.util.List; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflowsApplication.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsApplication.java similarity index 95% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflowsApplication.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsApplication.java index f384fff5bc..0a2c73a58c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestWorkflowsApplication.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsApplication.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprWorkflowsConfiguration.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsConfiguration.java similarity index 95% rename from sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprWorkflowsConfiguration.java rename to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsConfiguration.java index 0a2487b70c..78f749e9dd 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprWorkflowsConfiguration.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsConfiguration.java @@ -11,7 +11,7 @@ limitations under the License. */ -package io.dapr.it.testcontainers; +package io.dapr.it.testcontainers.workflows; import com.fasterxml.jackson.databind.ObjectMapper; import io.dapr.config.Properties; @@ -24,7 +24,7 @@ import java.util.Map; @Configuration -public class TestDaprWorkflowsConfiguration { +public class TestWorkflowsConfiguration { @Bean public ObjectMapper mapper() { return new ObjectMapper();