diff --git a/temporal-sdk/src/main/java/io/temporal/client/ActivityExecutionDescription.java b/temporal-sdk/src/main/java/io/temporal/client/ActivityExecutionDescription.java index 485f6ce7b..fa4d4f77c 100644 --- a/temporal-sdk/src/main/java/io/temporal/client/ActivityExecutionDescription.java +++ b/temporal-sdk/src/main/java/io/temporal/client/ActivityExecutionDescription.java @@ -355,7 +355,7 @@ public Priority getPriority() { * the result if called multiple times. */ @Nullable - public String getStaticSummary() { + public String getSummary() { if (!response.getInfo().getUserMetadata().hasSummary()) { return null; } diff --git a/temporal-sdk/src/main/java/io/temporal/client/StartActivityOptions.java b/temporal-sdk/src/main/java/io/temporal/client/StartActivityOptions.java index 12e86b052..6b416a662 100644 --- a/temporal-sdk/src/main/java/io/temporal/client/StartActivityOptions.java +++ b/temporal-sdk/src/main/java/io/temporal/client/StartActivityOptions.java @@ -42,7 +42,7 @@ public static final class Builder { ActivityIdConflictPolicy.ACTIVITY_ID_CONFLICT_POLICY_UNSPECIFIED; private @Nullable RetryOptions retryOptions; private @Nullable SearchAttributes typedSearchAttributes; - private @Nullable String staticSummary; + private @Nullable String summary; private @Nullable String staticDetails; private @Nullable Priority priority; private @Nullable Duration startDelay; @@ -63,7 +63,7 @@ private Builder(StartActivityOptions options) { this.idConflictPolicy = options.idConflictPolicy; this.retryOptions = options.retryOptions; this.typedSearchAttributes = options.typedSearchAttributes; - this.staticSummary = options.staticSummary; + this.summary = options.summary; this.staticDetails = options.staticDetails; this.priority = options.priority; this.startDelay = options.startDelay; @@ -148,8 +148,8 @@ public Builder setTypedSearchAttributes(SearchAttributes typedSearchAttributes) } /** Short static summary for UI display; encoded as a payload in UserMetadata. */ - public Builder setStaticSummary(String staticSummary) { - this.staticSummary = staticSummary; + public Builder setSummary(String summary) { + this.summary = summary; return this; } @@ -200,7 +200,7 @@ public StartActivityOptions build() { private final ActivityIdConflictPolicy idConflictPolicy; private final @Nullable RetryOptions retryOptions; private final @Nullable SearchAttributes typedSearchAttributes; - private final @Nullable String staticSummary; + private final @Nullable String summary; private final @Nullable String staticDetails; private final @Nullable Priority priority; private final @Nullable Duration startDelay; @@ -216,7 +216,7 @@ private StartActivityOptions(Builder builder) { this.idConflictPolicy = builder.idConflictPolicy; this.retryOptions = builder.retryOptions; this.typedSearchAttributes = builder.typedSearchAttributes; - this.staticSummary = builder.staticSummary; + this.summary = builder.summary; this.staticDetails = builder.staticDetails; this.priority = builder.priority; this.startDelay = builder.startDelay; @@ -273,8 +273,8 @@ public SearchAttributes getTypedSearchAttributes() { } @Nullable - public String getStaticSummary() { - return staticSummary; + public String getSummary() { + return summary; } @Nullable @@ -307,7 +307,7 @@ public boolean equals(Object o) { && idConflictPolicy == that.idConflictPolicy && Objects.equals(retryOptions, that.retryOptions) && Objects.equals(typedSearchAttributes, that.typedSearchAttributes) - && Objects.equals(staticSummary, that.staticSummary) + && Objects.equals(summary, that.summary) && Objects.equals(staticDetails, that.staticDetails) && Objects.equals(priority, that.priority) && Objects.equals(startDelay, that.startDelay); @@ -326,7 +326,7 @@ public int hashCode() { idConflictPolicy, retryOptions, typedSearchAttributes, - staticSummary, + summary, staticDetails, priority, startDelay); @@ -356,7 +356,7 @@ public String toString() { + ", typedSearchAttributes=" + typedSearchAttributes + ", staticSummary='" - + staticSummary + + summary + "', staticDetails='" + staticDetails + "', priority=" diff --git a/temporal-sdk/src/main/java/io/temporal/internal/client/RootActivityClientInvoker.java b/temporal-sdk/src/main/java/io/temporal/internal/client/RootActivityClientInvoker.java index 077ad3424..418a097db 100644 --- a/temporal-sdk/src/main/java/io/temporal/internal/client/RootActivityClientInvoker.java +++ b/temporal-sdk/src/main/java/io/temporal/internal/client/RootActivityClientInvoker.java @@ -109,9 +109,9 @@ public StartActivityOutput startActivity(StartActivityInput input) { request.setSearchAttributes( SearchAttributesUtil.encodeTyped(options.getTypedSearchAttributes())); } - if (options.getStaticSummary() != null || options.getStaticDetails() != null) { + if (options.getSummary() != null || options.getStaticDetails() != null) { UserMetadata userMetadata = - makeUserMetaData(options.getStaticSummary(), options.getStaticDetails(), dc); + makeUserMetaData(options.getSummary(), options.getStaticDetails(), dc); if (userMetadata != null) { request.setUserMetadata(userMetadata); } diff --git a/temporal-sdk/src/test/java/io/temporal/client/StartActivityOptionsTest.java b/temporal-sdk/src/test/java/io/temporal/client/StartActivityOptionsTest.java index 92ac00cea..2fd67405a 100644 --- a/temporal-sdk/src/test/java/io/temporal/client/StartActivityOptionsTest.java +++ b/temporal-sdk/src/test/java/io/temporal/client/StartActivityOptionsTest.java @@ -90,7 +90,7 @@ public void testToBuilderPreservesAllFields() { .setIdReusePolicy(ActivityIdReusePolicy.ACTIVITY_ID_REUSE_POLICY_REJECT_DUPLICATE) .setIdConflictPolicy(ActivityIdConflictPolicy.ACTIVITY_ID_CONFLICT_POLICY_FAIL) .setRetryOptions(retry) - .setStaticSummary("summary") + .setSummary("summary") .setStaticDetails("details") .setPriority(priority) .setStartDelay(Duration.ofSeconds(7)) @@ -107,7 +107,7 @@ public void testToBuilderPreservesAllFields() { ActivityIdReusePolicy.ACTIVITY_ID_REUSE_POLICY_REJECT_DUPLICATE, copy.getIdReusePolicy()); assertEquals( ActivityIdConflictPolicy.ACTIVITY_ID_CONFLICT_POLICY_FAIL, copy.getIdConflictPolicy()); - assertEquals("summary", copy.getStaticSummary()); + assertEquals("summary", copy.getSummary()); assertEquals("details", copy.getStaticDetails()); assertEquals(priority, copy.getPriority()); assertEquals(Duration.ofSeconds(7), copy.getStartDelay()); diff --git a/temporal-sdk/src/test/java/io/temporal/client/functional/StandaloneActivityTest.java b/temporal-sdk/src/test/java/io/temporal/client/functional/StandaloneActivityTest.java index 2a7c87c69..49c971d43 100644 --- a/temporal-sdk/src/test/java/io/temporal/client/functional/StandaloneActivityTest.java +++ b/temporal-sdk/src/test/java/io/temporal/client/functional/StandaloneActivityTest.java @@ -18,7 +18,6 @@ import io.temporal.client.*; import io.temporal.common.RetryOptions; import io.temporal.common.interceptors.ActivityClientCallsInterceptor; -import io.temporal.common.interceptors.ActivityClientCallsInterceptor.*; import io.temporal.common.interceptors.ActivityClientCallsInterceptorBase; import io.temporal.common.interceptors.ActivityClientInterceptorBase; import io.temporal.failure.ApplicationFailure; @@ -417,7 +416,7 @@ public void testDescribeUserMetadataIsAccurate() { .setId(uniqueId()) .setTaskQueue(testWorkflowRule.getTaskQueue()) .setScheduleToCloseTimeout(Duration.ofMinutes(5)) - .setStaticSummary("Test summary") + .setSummary("Test summary") .setStaticDetails("Test details\nLine 2") .build(); @@ -426,7 +425,7 @@ public void testDescribeUserMetadataIsAccurate() { handle.getResult(); ActivityExecutionDescription desc = handle.describe(); - assertEquals("Test summary", desc.getStaticSummary()); + assertEquals("Test summary", desc.getSummary()); assertEquals("Test details\nLine 2", desc.getStaticDetails()); }