From a843e2b4271a70bbd0e5da5940a823da527394ed Mon Sep 17 00:00:00 2001 From: Maxim Fateev Date: Thu, 18 Jun 2020 21:35:43 -0700 Subject: [PATCH 1/4] Fixed publishing vars --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 601e95229e..fa7381df7e 100644 --- a/build.gradle +++ b/build.gradle @@ -300,8 +300,8 @@ publishing { nexusPublishing { repositories { sonatype { - username = hasProperty('ossrhUsername') ? ossrhUsername : '' - password = hasProperty('ossrhPassword') ? ossrhPassword : '' + username = ossrhUsername?.trim() ? ossrhUsername : '' + password = ossrhPassword?.trim() ? ossrhPassword : '' nexusUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") snapshotRepositoryUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/") } From f9b66477a33c2bdd8227a0a7a3304f30e3caddfb Mon Sep 17 00:00:00 2001 From: Maxim Fateev Date: Thu, 18 Jun 2020 21:38:29 -0700 Subject: [PATCH 2/4] Fixed NPE in default retry options serialization --- .../temporal/internal/sync/WorkflowRetryerInternal.java | 8 ++++++-- src/test/java/io/temporal/workflow/WorkflowTest.java | 7 +------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java b/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java index 16dfe0d275..c64bde32ed 100644 --- a/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java +++ b/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java @@ -187,12 +187,16 @@ private static Promise retryAsync( private static RetryOptions getRetryOptionsSideEffect(String retryId, RetryOptions options) { options = RetryOptions.newBuilder(options).validateBuildWithDefaults(); + long maximumIntervalMillis = + options.getMaximumInterval() != null ? options.getMaximumInterval().toMillis() : 0; + long initialIntervalMillis = + options.getInitialInterval() != null ? options.getInitialInterval().toMillis() : 0; SerializableRetryOptions sOptions = new SerializableRetryOptions( - options.getInitialInterval().toMillis(), + initialIntervalMillis, options.getBackoffCoefficient(), options.getMaximumAttempts(), - options.getMaximumInterval().toMillis(), + maximumIntervalMillis, options.getDoNotRetry()); SerializableRetryOptions sRetryOptions = WorkflowInternal.mutableSideEffect( diff --git a/src/test/java/io/temporal/workflow/WorkflowTest.java b/src/test/java/io/temporal/workflow/WorkflowTest.java index acc07b93d8..64774ffc0d 100644 --- a/src/test/java/io/temporal/workflow/WorkflowTest.java +++ b/src/test/java/io/temporal/workflow/WorkflowTest.java @@ -712,12 +712,7 @@ public String execute(String taskList) { .setMaximumAttempts(3) .build(); } else { - retryOptions = - RetryOptions.newBuilder() - .setMaximumInterval(Duration.ofSeconds(1)) - .setInitialInterval(Duration.ofSeconds(1)) - .setMaximumAttempts(2) - .build(); + retryOptions = RetryOptions.newBuilder().setMaximumAttempts(2).build(); } TestActivities activities = Workflow.newActivityStub(TestActivities.class, options.build()); Workflow.retry(retryOptions, Optional.of(Duration.ofDays(1)), () -> activities.throwIO()); From cdd8b9892da57aba1f264b861aed0c882df5dd77 Mon Sep 17 00:00:00 2001 From: Maxim Fateev Date: Fri, 19 Jun 2020 08:15:49 -0700 Subject: [PATCH 3/4] Fixed ossrh properties --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fa7381df7e..601e95229e 100644 --- a/build.gradle +++ b/build.gradle @@ -300,8 +300,8 @@ publishing { nexusPublishing { repositories { sonatype { - username = ossrhUsername?.trim() ? ossrhUsername : '' - password = ossrhPassword?.trim() ? ossrhPassword : '' + username = hasProperty('ossrhUsername') ? ossrhUsername : '' + password = hasProperty('ossrhPassword') ? ossrhPassword : '' nexusUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") snapshotRepositoryUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/") } From b3ff7146540dabd03b01d0a14044a51010407c20 Mon Sep 17 00:00:00 2001 From: Maxim Fateev Date: Sun, 21 Jun 2020 09:03:10 -0700 Subject: [PATCH 4/4] comment fixes --- src/main/java/io/temporal/activity/Activity.java | 8 ++++---- src/main/java/io/temporal/workflow/Workflow.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/temporal/activity/Activity.java b/src/main/java/io/temporal/activity/Activity.java index cea4589a64..3db03eb7ac 100644 --- a/src/main/java/io/temporal/activity/Activity.java +++ b/src/main/java/io/temporal/activity/Activity.java @@ -27,6 +27,7 @@ import io.temporal.internal.sync.ActivityInternal; import io.temporal.internal.sync.WorkflowInternal; import io.temporal.serviceclient.WorkflowServiceStubs; + import java.lang.reflect.Type; import java.util.Optional; @@ -304,13 +305,12 @@ public static String getNamespace() { * try { * return someCall(); * } catch (Exception e) { - * throw CheckedExceptionWrapper.throwWrapped(e); + * throw Activity.wrap(e); * } * * - * If throwWrapped returned void it wouldn't be possible to write - * throw CheckedExceptionWrapper.throwWrapped and compiler would complain about missing - * return. + * If wrap returned void it wouldn't be possible to write + * throw Activity.wrap and compiler would complain about missing return. * * @return never returns as always throws. */ diff --git a/src/main/java/io/temporal/workflow/Workflow.java b/src/main/java/io/temporal/workflow/Workflow.java index d5b7e24f41..267f4056ae 100644 --- a/src/main/java/io/temporal/workflow/Workflow.java +++ b/src/main/java/io/temporal/workflow/Workflow.java @@ -821,7 +821,7 @@ public static void retry( * try { * return someCall(); * } catch (Exception e) { - * throw CheckedExceptionWrapper.wrap(e); + * throw Workflow.wrap(e); * } * *