From ae656daba64e7335f3f82d2af73c816f7796174c Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Mon, 20 Dec 2021 12:52:04 -0500 Subject: [PATCH] Add default top level error summary --- hooks/src/main/java/com/okta/hooks/sdk/Hooks.java | 8 ++++---- .../test/groovy/com/okta/hooks/sdk/TokenHooksTest.groovy | 2 +- .../groovy/com/okta/hooks/sdk/UserRegHooksTest.groovy | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hooks/src/main/java/com/okta/hooks/sdk/Hooks.java b/hooks/src/main/java/com/okta/hooks/sdk/Hooks.java index 9775803..28c8d8a 100644 --- a/hooks/src/main/java/com/okta/hooks/sdk/Hooks.java +++ b/hooks/src/main/java/com/okta/hooks/sdk/Hooks.java @@ -77,7 +77,7 @@ private static class DefaultBuilder implements Builder { @Override public Builder error(String message) { - this.error = getOrCreateError(false) + this.error = getOrCreateError(false, message) .setErrorSummary(message); return this; } @@ -90,7 +90,7 @@ public Builder errorCause(String message) { @Override public Builder errorCause(HookErrorCause cause) { - error = getOrCreateError(true); + error = getOrCreateError(true, cause.getErrorSummary()); error.getErrorCauses().add(cause); return this; } @@ -139,9 +139,9 @@ public String toString() { return SERIALIZER.serialize(build()); } - private HookError getOrCreateError(boolean initCauses) { + private HookError getOrCreateError(boolean initCauses, String errorSummary) { - HookError hookError = error != null ? error : new HookError(); + HookError hookError = error != null ? error : new HookError().setErrorSummary(errorSummary); if (initCauses && hookError.getErrorCauses() == null) { hookError.setErrorCauses(new ArrayList<>()); diff --git a/hooks/src/test/groovy/com/okta/hooks/sdk/TokenHooksTest.groovy b/hooks/src/test/groovy/com/okta/hooks/sdk/TokenHooksTest.groovy index e6e6d66..7ec0c63 100644 --- a/hooks/src/test/groovy/com/okta/hooks/sdk/TokenHooksTest.groovy +++ b/hooks/src/test/groovy/com/okta/hooks/sdk/TokenHooksTest.groovy @@ -38,7 +38,7 @@ class TokenHooksTest implements HooksSupport { def builder = Hooks.builder() .error("test-error") - def expectedToString = expected"""{"error": {"errorSummary": "test-error"}}""" + def expectedToString = expected"""{"error": { "errorSummary": "test-error"}}""" assertThat builder.toString(), is(expectedToString) } diff --git a/hooks/src/test/groovy/com/okta/hooks/sdk/UserRegHooksTest.groovy b/hooks/src/test/groovy/com/okta/hooks/sdk/UserRegHooksTest.groovy index 254daf8..fad87a5 100644 --- a/hooks/src/test/groovy/com/okta/hooks/sdk/UserRegHooksTest.groovy +++ b/hooks/src/test/groovy/com/okta/hooks/sdk/UserRegHooksTest.groovy @@ -32,7 +32,7 @@ class UserRegHooksTest implements HooksSupport { def builder = Hooks.builder() .errorCause("test-error") - def expectedToString = expected"""{"error": {"errorCauses": [{ "errorSummary": "test-error" }]}}""" + def expectedToString = expected"""{"error": { "errorSummary": "test-error", "errorCauses": [{ "errorSummary": "test-error" }]}}""" assertThat builder.toString(), is(expectedToString) } @@ -43,7 +43,7 @@ class UserRegHooksTest implements HooksSupport { .errorCause("test-error") .debugContext(["foo": "bar", "one": "two"]) - def expectedToString = expected"""{"error": {"errorCauses": [{ "errorSummary": "test-error" }]}, "debugContext": {"foo": "bar", "one": "two"}}""" + def expectedToString = expected"""{"error": {"errorSummary": "test-error", "errorCauses": [{ "errorSummary": "test-error" }]}, "debugContext": {"foo": "bar", "one": "two"}}""" assertThat builder.toString(), is(expectedToString) } @@ -96,7 +96,7 @@ class UserRegHooksTest implements HooksSupport { .errorCause("test-error1") .errorCause("test-error2") - def expectedToString = expected"""{"error": {"errorCauses": [{ "errorSummary": "test-error1" },{ "errorSummary": "test-error2" }]}}""" + def expectedToString = expected"""{"error": {"errorSummary": "test-error1", "errorCauses": [{ "errorSummary": "test-error1" },{ "errorSummary": "test-error2" }]}}""" assertThat builder.toString(), is(expectedToString) }