From 4c8de5e507ac9d286caac847ecd18865b7f33e58 Mon Sep 17 00:00:00 2001 From: Alex Kulikov Date: Tue, 4 Oct 2022 12:46:12 +0100 Subject: [PATCH 1/2] check entire Throwable in RetryMapping::matchesThrowable --- .../types/transfer/retry/RetryMapping.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/portability-types-transfer/src/main/java/org/datatransferproject/types/transfer/retry/RetryMapping.java b/portability-types-transfer/src/main/java/org/datatransferproject/types/transfer/retry/RetryMapping.java index 29ba7ee83..d6fa92e3b 100644 --- a/portability-types-transfer/src/main/java/org/datatransferproject/types/transfer/retry/RetryMapping.java +++ b/portability-types-transfer/src/main/java/org/datatransferproject/types/transfer/retry/RetryMapping.java @@ -17,6 +17,7 @@ package org.datatransferproject.types.transfer.retry; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.Arrays; /** @@ -48,13 +49,18 @@ public RetryStrategy getStrategy() { } public boolean matchesThrowable(Throwable throwable) { - // TODO: examine entire throwable, not just toString String input = throwable.toString(); for (String regex : regexes) { if (input.matches(regex)) { return true; } } + String stacktrace = ExceptionUtils.getStackTrace(throwable); + for (String regex : regexes) { + if (stacktrace.matches(regex)) { + return true; + } + } return false; } From e8c517b557c4412efcb26b13dd6cd3532e03042a Mon Sep 17 00:00:00 2001 From: Alex Kulikov Date: Tue, 4 Oct 2022 13:03:25 +0100 Subject: [PATCH 2/2] update gradle deps --- portability-types-transfer/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portability-types-transfer/build.gradle b/portability-types-transfer/build.gradle index fe1988b59..ddeb7dc94 100644 --- a/portability-types-transfer/build.gradle +++ b/portability-types-transfer/build.gradle @@ -28,6 +28,8 @@ dependencies { annotationProcessor "com.google.auto.value:auto-value:${autoValueVersion}" compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}") + + compile('org.apache.commons:commons-lang3:3.11') testCompile("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") testCompile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}")