Skip to content

Commit a0ad0fa

Browse files
rename getApplicationErrorCategory to getCategory
1 parent 2a877cb commit a0ad0fa

5 files changed

Lines changed: 9 additions & 19 deletions

File tree

temporal-sdk/src/main/java/io/temporal/failure/ApplicationFailure.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public void setNextRetryDelay(Duration nextRetryDelay) {
234234
this.nextRetryDelay = nextRetryDelay;
235235
}
236236

237-
public ApplicationErrorCategory getApplicationErrorCategory() {
237+
public ApplicationErrorCategory getCategory() {
238238
return category;
239239
}
240240

temporal-sdk/src/main/java/io/temporal/failure/DefaultFailureConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private Failure exceptionToFailure(Throwable throwable) {
263263
ApplicationFailureInfo.newBuilder()
264264
.setType(ae.getType())
265265
.setNonRetryable(ae.isNonRetryable())
266-
.setCategory(FailureUtils.categoryToProto(ae.getApplicationErrorCategory()));
266+
.setCategory(FailureUtils.categoryToProto(ae.getCategory()));
267267
Optional<Payloads> details = ((EncodedValues) ae.getDetails()).toPayloads();
268268
if (details.isPresent()) {
269269
info.setDetails(details.get());

temporal-sdk/src/main/java/io/temporal/internal/common/FailureUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ private FailureUtils() {}
3030

3131
public static boolean isBenignApplicationFailure(@Nullable Throwable t) {
3232
if (t instanceof ApplicationFailure
33-
&& ((ApplicationFailure) t).getApplicationErrorCategory()
34-
== ApplicationErrorCategory.BENIGN) {
33+
&& ((ApplicationFailure) t).getCategory() == ApplicationErrorCategory.BENIGN) {
3534
return true;
3635
}
3736
return false;

temporal-sdk/src/test/java/io/temporal/internal/worker/ActivityFailedMetricsTests.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ public void activityFailureMetricBenignApplicationError() {
201201
nonBenignErr.getCause().getCause() instanceof ApplicationFailure);
202202
ApplicationFailure af = (ApplicationFailure) nonBenignErr.getCause().getCause();
203203
assertFalse(
204-
"Failure should not be benign",
205-
af.getApplicationErrorCategory() == ApplicationErrorCategory.BENIGN);
204+
"Failure should not be benign", af.getCategory() == ApplicationErrorCategory.BENIGN);
206205
assertEquals("Non-benign activity failure", af.getOriginalMessage());
207206

208207
reporter.assertCounter(
@@ -230,9 +229,7 @@ public void activityFailureMetricBenignApplicationError() {
230229
"Inner cause should be ApplicationFailure",
231230
benignErr.getCause().getCause() instanceof ApplicationFailure);
232231
ApplicationFailure af2 = (ApplicationFailure) benignErr.getCause().getCause();
233-
assertTrue(
234-
"Failure should be benign",
235-
af2.getApplicationErrorCategory() == ApplicationErrorCategory.BENIGN);
232+
assertTrue("Failure should be benign", af2.getCategory() == ApplicationErrorCategory.BENIGN);
236233
assertEquals("Benign activity failure", af2.getOriginalMessage());
237234

238235
// Expect metrics to remain unchanged for benign failure
@@ -274,8 +271,7 @@ public void localActivityFailureMetricBenignApplicationError() {
274271
nonBenignErr.getCause().getCause() instanceof ApplicationFailure);
275272
ApplicationFailure af = (ApplicationFailure) nonBenignErr.getCause().getCause();
276273
assertFalse(
277-
"Failure should not be benign",
278-
af.getApplicationErrorCategory() == ApplicationErrorCategory.BENIGN);
274+
"Failure should not be benign", af.getCategory() == ApplicationErrorCategory.BENIGN);
279275
assertEquals("Non-benign activity failure", af.getOriginalMessage());
280276

281277
// Expect metrics to be incremented for non-benign failure
@@ -303,9 +299,7 @@ public void localActivityFailureMetricBenignApplicationError() {
303299
"Inner cause should be ApplicationFailure",
304300
benignErr.getCause().getCause() instanceof ApplicationFailure);
305301
ApplicationFailure af2 = (ApplicationFailure) benignErr.getCause().getCause();
306-
assertTrue(
307-
"Failure should be benign",
308-
af2.getApplicationErrorCategory() == ApplicationErrorCategory.BENIGN);
302+
assertTrue("Failure should be benign", af2.getCategory() == ApplicationErrorCategory.BENIGN);
309303
assertEquals("Benign activity failure", af2.getOriginalMessage());
310304

311305
// Expect metrics to remain unchanged for benign failure

temporal-sdk/src/test/java/io/temporal/internal/worker/WorkflowFailedMetricsTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ public void workflowFailureMetricBenignApplicationError() {
217217
Throwable cause1 = e1.getCause();
218218
assertTrue("Cause should be ApplicationFailure", cause1 instanceof ApplicationFailure);
219219
boolean isBenign =
220-
((ApplicationFailure) cause1).getApplicationErrorCategory()
221-
== ApplicationErrorCategory.BENIGN;
220+
((ApplicationFailure) cause1).getCategory() == ApplicationErrorCategory.BENIGN;
222221
assertFalse("Failure should not be benign", isBenign);
223222
assertEquals("Non-benign failure", ((TemporalFailure) cause1).getOriginalMessage());
224223

@@ -246,9 +245,7 @@ public void workflowFailureMetricBenignApplicationError() {
246245

247246
Throwable cause2 = e2.getCause();
248247
assertTrue("Cause should be ApplicationFailure", cause2 instanceof ApplicationFailure);
249-
isBenign =
250-
((ApplicationFailure) cause2).getApplicationErrorCategory()
251-
== ApplicationErrorCategory.BENIGN;
248+
isBenign = ((ApplicationFailure) cause2).getCategory() == ApplicationErrorCategory.BENIGN;
252249
assertTrue("Failure should be benign", isBenign);
253250
assertEquals("Benign failure", ((TemporalFailure) cause2).getOriginalMessage());
254251

0 commit comments

Comments
 (0)