From 4c5e9aa8b817799142f4ce7fc9a07d35ae79a865 Mon Sep 17 00:00:00 2001
From: Juergen Fickel <juergen.fickel@bosch.io>
Date: Fri, 4 Nov 2022 13:38:21 +0100
Subject: [PATCH] Made instance creation of `KamonHttpContextPropagation` even
 more fluent.

Signed-off-by: Juergen Fickel <juergen.fickel@bosch.io>
---
 .../span/KamonHttpContextPropagation.java     | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/internal/utils/tracing/src/main/java/org/eclipse/ditto/internal/utils/tracing/span/KamonHttpContextPropagation.java b/internal/utils/tracing/src/main/java/org/eclipse/ditto/internal/utils/tracing/span/KamonHttpContextPropagation.java
index a458072bf4..9fac417620 100644
--- a/internal/utils/tracing/src/main/java/org/eclipse/ditto/internal/utils/tracing/span/KamonHttpContextPropagation.java
+++ b/internal/utils/tracing/src/main/java/org/eclipse/ditto/internal/utils/tracing/span/KamonHttpContextPropagation.java
@@ -57,25 +57,15 @@ public static Result<KamonHttpContextPropagation, Throwable> newInstanceForChann
             final CharSequence propagationChannelName
     ) {
         checkNotNull(propagationChannelName, "propagationChannelName");
-        return getHttpPropagation(propagationChannelName.toString()).map(KamonHttpContextPropagation::new);
-    }
-
-    private static Result<Propagation<HttpPropagation.HeaderReader, HttpPropagation.HeaderWriter>, Throwable> getHttpPropagation(
-            final String propagationChannelName
-    ) {
-        final Result<Propagation<HttpPropagation.HeaderReader, HttpPropagation.HeaderWriter>, Throwable> result;
-        final var contextPropagationOption = Kamon.httpPropagation(propagationChannelName);
-        if (contextPropagationOption.isDefined()) {
-            result = Result.ok(contextPropagationOption.get());
-        } else {
-            result = Result.err(new IllegalArgumentException(
+        return Kamon.httpPropagation(propagationChannelName.toString())
+                .map(KamonHttpContextPropagation::new)
+                .map(Result::ok)
+                .getOrElse(() -> Result.err(new IllegalArgumentException(
                     MessageFormat.format(
                             "HTTP propagation for channel name <{0}> is undefined.",
                             propagationChannelName
                     )
-            ));
-        }
-        return result;
+            )));
     }
 
     /**