diff options
Diffstat (limited to 'vid-app-common/src/main/java')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseRequestIdFilter.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseRequestIdFilter.java b/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseRequestIdFilter.java index 1c96819c8..faaf55ae7 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseRequestIdFilter.java +++ b/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseRequestIdFilter.java @@ -41,10 +41,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; -import org.onap.logging.ref.slf4j.ONAPLogConstants.MDCs; import org.onap.vid.logging.Headers; import org.onap.vid.logging.RequestIdHeader; -import org.slf4j.MDC; import org.springframework.web.filter.GenericFilterBean; @WebFilter(urlPatterns = "/*") @@ -84,17 +82,12 @@ public class PromiseRequestIdFilter extends GenericFilterBean { if (isWrapNeeded(highestPriorityHeader, originalRequestId)) { // Copy originalRequestId to the promised header value - request = new PromiseRequestIdRequestWrapper(httpRequest, - firstValidUuidOrElse(originalRequestId, requestIdFromMDC(), UUID::randomUUID)); + request = new PromiseRequestIdRequestWrapper(httpRequest, toUuidOrElse(originalRequestId, UUID::randomUUID)); } return request; } - private String requestIdFromMDC() { - return MDC.get(MDCs.REQUEST_ID); - } - private boolean verifyAndValidateUuid(String value) { return isNotEmpty(value) && uuidRegex.matcher(value).matches(); } @@ -106,10 +99,6 @@ public class PromiseRequestIdFilter extends GenericFilterBean { return !headerExistsAndValid; } - UUID firstValidUuidOrElse(String uuid1, String uuid2, Supplier<UUID> uuidSupplier) { - return toUuidOrElse(uuid1, () -> toUuidOrElse(uuid2, uuidSupplier)); - } - UUID toUuidOrElse(String uuid, Supplier<UUID> uuidSupplier) { if (verifyAndValidateUuid(uuid)) { try { |