Skip to content

fix: add missing @TemporalDsl receiver annotation to setRetryOptions extensions #2915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vikas0686 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: add missing @TemporalDsl receiver annotation to setRetryOptions extensions #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion temporal-kotlin/src/main/kotlin/io/temporal/activity/ActivityOptionsExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ inline fun ActivityOptions.copy(
* @see ActivityOptions.Builder.setRetryOptions
* @see ActivityOptions.getRetryOptions
*/
inline fun ActivityOptions.Builder.setRetryOptions(
inline fun @TemporalDsl ActivityOptions.Builder.setRetryOptions(
retryOptions: @TemporalDsl RetryOptions.Builder.() -> Unit
) {
setRetryOptions(RetryOptions(retryOptions))
Expand Down
2 changes: 1 addition & 1 deletion temporal-kotlin/src/main/kotlin/io/temporal/client/WorkflowOptionsExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ inline fun WorkflowOptions.copy(
* @see WorkflowOptions.Builder.setRetryOptions
* @see WorkflowOptions.getRetryOptions
*/
inline fun WorkflowOptions.Builder.setRetryOptions(
inline fun @TemporalDsl WorkflowOptions.Builder.setRetryOptions(
retryOptions: @TemporalDsl RetryOptions.Builder.() -> Unit
) {
setRetryOptions(RetryOptions(retryOptions))
Expand Down
2 changes: 1 addition & 1 deletion temporal-kotlin/src/main/kotlin/io/temporal/workflow/ChildWorkflowOptionsExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ inline fun ChildWorkflowOptions.copy(
* @see ChildWorkflowOptions.Builder.setRetryOptions
* @see ChildWorkflowOptions.getRetryOptions
*/
inline fun ChildWorkflowOptions.Builder.setRetryOptions(
inline fun @TemporalDsl ChildWorkflowOptions.Builder.setRetryOptions(
retryOptions: @TemporalDsl RetryOptions.Builder.() -> Unit
) {
setRetryOptions(RetryOptions(retryOptions))
Expand Down
21 changes: 21 additions & 0 deletions temporal-kotlin/src/test/kotlin/io/temporal/activity/ActivityOptionsExtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,27 @@ class ActivityOptionsExtTest {
assertEquals(builderActivityOptions, dslActivityOptions)
}

@Test
fun `setRetryOptions DSL extension should work on ActivityOptions builder directly`() {
val builder = ActivityOptions.newBuilder().setTaskQueue("TestQueue")
builder.setRetryOptions {
setInitialInterval(Duration.ofMillis(50))
setMaximumAttempts(5)
}

val expected = ActivityOptions.newBuilder()
.setTaskQueue("TestQueue")
.setRetryOptions(
RetryOptions.newBuilder()
.setInitialInterval(Duration.ofMillis(50))
.setMaximumAttempts(5)
.build()
)
.build()

assertEquals(expected, builder.build())
}

@Test
fun `ActivityOptions copy() DSL should merge override options`() {
val sourceOptions = ActivityOptions {
Expand Down
21 changes: 21 additions & 0 deletions temporal-kotlin/src/test/kotlin/io/temporal/client/WorkflowOptionsExtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,27 @@ class WorkflowOptionsExtTest {
assertEquals(builderOptions, dslOptions)
}

@Test
fun `setRetryOptions DSL extension should work on WorkflowOptions builder directly`() {
val builder = WorkflowOptions.newBuilder().setTaskQueue("TestQueue")
builder.setRetryOptions {
setInitialInterval(Duration.ofMillis(50))
setMaximumAttempts(5)
}

val expected = WorkflowOptions.newBuilder()
.setTaskQueue("TestQueue")
.setRetryOptions(
RetryOptions.newBuilder()
.setInitialInterval(Duration.ofMillis(50))
.setMaximumAttempts(5)
.build()
)
.build()

assertEquals(expected, builder.build())
}

@Test
fun `WorkflowOptions copy() DSL should merge override options`() {
val sourceOptions = WorkflowOptions {
Expand Down
21 changes: 21 additions & 0 deletions temporal-kotlin/src/test/kotlin/io/temporal/workflow/ChildWorkflowOptionsExtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,27 @@ class ChildWorkflowOptionsExtTest {
assertEquals(builderOptions, dslOptions)
}

@Test
fun `setRetryOptions DSL extension should work on ChildWorkflowOptions builder directly`() {
val builder = ChildWorkflowOptions.newBuilder().setTaskQueue("TestQueue")
builder.setRetryOptions {
setInitialInterval(Duration.ofMillis(50))
setMaximumAttempts(3)
}

val expected = ChildWorkflowOptions.newBuilder()
.setTaskQueue("TestQueue")
.setRetryOptions(
RetryOptions.newBuilder()
.setInitialInterval(Duration.ofMillis(50))
.setMaximumAttempts(3)
.build()
)
.build()

assertEquals(expected, builder.build())
}

@Test
fun `ChildWorkflowOptions copy() DSL should merge override options`() {
val sourceOptions = ChildWorkflowOptions {
Expand Down