Drop static method

Author: damianmalczewski

problem4j-spring-web/src/main/java/io/github/problem4j/spring/web/context/AttributeSupport.java

@@ -14,33 +14,20 @@
  */
 package io.github.problem4j.spring.web.context;
 
-import java.util.UUID;
-
 /**
  * Utility class providing constants and helper methods for tracing support within the Problem4J.
  */
 public final class AttributeSupport {
 
   /** Request attribute key used to store a trace identifier. */
-  public static final String TRACE_ID =
-      "io.github.problem4j.spring.web.context.ProblemContext.traceId";
+  public static final String TRACE_ID_ATTRIBUTE = "io.github.problem4j.spring.web.traceId";
 
   /**
    * Request attribute key used to store the object associated with the current request. It allows
    * sharing contextual information (such as trace identifiers or additional diagnostic data)
    * between components involved in problem handling.
    */
-  public static final String PROBLEM_CONTEXT =
-      "io.github.problem4j.spring.web.context.ProblemContext";
-
-  /**
-   * Generates a random trace identifier in {@code urn:uuid:<uuid>} format.
-   *
-   * @return generated trace identifier
-   */
-  public static String getRandomTraceId() {
-    return "urn:uuid:" + UUID.randomUUID();
-  }
+  public static final String PROBLEM_CONTEXT_ATTRIBUTE = "io.github.problem4j.spring.web.traceId";
 
   private AttributeSupport() {}
 }

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/ExceptionWebFluxAdvice.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webflux;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
 import static io.github.problem4j.spring.web.util.ProblemSupport.resolveStatus;
 import static io.github.problem4j.spring.webflux.WebFluxAdviceSupport.logAdviceException;
 
@@ -87,7 +87,7 @@ public ExceptionWebFluxAdvice(
   @ExceptionHandler(Exception.class)
   public Mono<ResponseEntity<Problem>> handleException(Exception ex, ServerWebExchange exchange) {
     ProblemContext context =
-        exchange.getAttributeOrDefault(PROBLEM_CONTEXT, ProblemContext.create());
+        exchange.getAttributeOrDefault(PROBLEM_CONTEXT_ATTRIBUTE, ProblemContext.create());
 
     HttpHeaders headers = new HttpHeaders();
     headers.setContentType(MediaType.APPLICATION_PROBLEM_JSON);

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/ProblemEnhancedWebFluxHandler.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webflux;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
 import static io.github.problem4j.spring.web.util.ProblemSupport.resolveStatus;
 import static io.github.problem4j.spring.webflux.WebFluxAdviceSupport.logAdviceException;
 
@@ -88,7 +88,7 @@ protected Mono<ResponseEntity<Object>> handleExceptionInternal(
       HttpStatusCode status,
       ServerWebExchange exchange) {
     ProblemContext context =
-        exchange.getAttributeOrDefault(PROBLEM_CONTEXT, ProblemContext.create());
+        exchange.getAttributeOrDefault(PROBLEM_CONTEXT_ATTRIBUTE, ProblemContext.create());
 
     headers = headers != null ? HttpHeaders.writableHttpHeaders(headers) : new HttpHeaders();
     headers.setContentType(MediaType.APPLICATION_PROBLEM_JSON);

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/ProblemExceptionWebFluxAdvice.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webflux;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
 import static io.github.problem4j.spring.webflux.WebFluxAdviceSupport.logAdviceException;
 
 import io.github.problem4j.core.Problem;
@@ -67,7 +67,7 @@ public ProblemExceptionWebFluxAdvice(
   public Mono<ResponseEntity<Problem>> handleProblemException(
       ProblemException ex, ServerWebExchange exchange) {
     ProblemContext context =
-        exchange.getAttributeOrDefault(PROBLEM_CONTEXT, ProblemContext.create());
+        exchange.getAttributeOrDefault(PROBLEM_CONTEXT_ATTRIBUTE, ProblemContext.create());
 
     HttpHeaders headers = new HttpHeaders();
     headers.setContentType(MediaType.APPLICATION_PROBLEM_JSON);

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/WebFluxAdviceSupport.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webflux;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.TRACE_ID;
+import static io.github.problem4j.spring.web.context.AttributeSupport.TRACE_ID_ATTRIBUTE;
 
 import org.slf4j.Logger;
 import org.springframework.web.server.ServerWebExchange;
@@ -27,7 +27,7 @@ static void logAdviceException(
         "Unable to resolve problem response (method={}, path={}, traceId={}, message={}, originalException=[{} : {}])",
         exchange.getRequest().getMethod(),
         exchange.getRequest().getPath(),
-        exchange.getAttribute(TRACE_ID),
+        exchange.getAttribute(TRACE_ID_ATTRIBUTE),
         e.getMessage(),
         ex.getClass().getName(),
         ex.getMessage(),

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/context/ProblemContextWebFluxFilter.java

@@ -14,13 +14,13 @@
  */
 package io.github.problem4j.spring.webflux.context;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
-import static io.github.problem4j.spring.web.context.AttributeSupport.TRACE_ID;
-import static io.github.problem4j.spring.web.context.AttributeSupport.getRandomTraceId;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
+import static io.github.problem4j.spring.web.context.AttributeSupport.TRACE_ID_ATTRIBUTE;
 
 import io.github.problem4j.core.ProblemContext;
 import io.github.problem4j.spring.web.context.ProblemContextSettings;
 import java.util.Optional;
+import java.util.UUID;
 import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
@@ -75,7 +75,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
    * @return an existing or newly created {@link ProblemContext}
    */
   protected ProblemContext buildProblemContext(ServerWebExchange exchange) {
-    return exchange.getAttribute(PROBLEM_CONTEXT) instanceof ProblemContext attribute
+    return exchange.getAttribute(PROBLEM_CONTEXT_ATTRIBUTE) instanceof ProblemContext attribute
         ? attribute
         : ProblemContext.create()
             .put("traceId", findTraceId(exchange).orElseGet(() -> initTraceId(exchange)));
@@ -88,7 +88,7 @@ protected ProblemContext buildProblemContext(ServerWebExchange exchange) {
    * @return an {@link Optional} containing the trace ID if present
    */
   protected Optional<String> findTraceId(ServerWebExchange exchange) {
-    return Optional.ofNullable(exchange.getAttribute(TRACE_ID)).map(Object::toString);
+    return Optional.ofNullable(exchange.getAttribute(TRACE_ID_ATTRIBUTE)).map(Object::toString);
   }
 
   /**
@@ -119,12 +119,12 @@ protected String initTraceId(ServerWebExchange exchange) {
    * @return a newly generated trace ID
    */
   protected String createNewTraceId(ServerWebExchange exchange) {
-    return getRandomTraceId();
+    return "urn:uuid:" + UUID.randomUUID();
   }
 
   protected void assignContextAttributes(ServerWebExchange exchange, ProblemContext context) {
-    exchange.getAttributes().put(PROBLEM_CONTEXT, context);
-    exchange.getAttributes().put(TRACE_ID, context.get("traceId"));
+    exchange.getAttributes().put(PROBLEM_CONTEXT_ATTRIBUTE, context);
+    exchange.getAttributes().put(TRACE_ID_ATTRIBUTE, context.get("traceId"));
   }
 
   /**
@@ -161,9 +161,9 @@ protected void assignTracingHeader(ServerWebExchange exchange, ProblemContext co
    * @return an updated {@link Context} containing the problem context and trace ID
    */
   protected Context contextWrite(Context ctx, ServerWebExchange exchange, ProblemContext context) {
-    ctx = ctx.put(PROBLEM_CONTEXT, context);
+    ctx = ctx.put(PROBLEM_CONTEXT_ATTRIBUTE, context);
     if (StringUtils.hasLength(context.get("traceId"))) {
-      ctx = ctx.put(TRACE_ID, context.get("traceId"));
+      ctx = ctx.put(TRACE_ID_ATTRIBUTE, context.get("traceId"));
     }
     return ctx;
   }

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/error/ProblemErrorWebExceptionHandler.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webflux.error;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
 import static io.github.problem4j.spring.web.util.ProblemSupport.resolveStatus;
 import static org.springframework.web.reactive.function.server.RequestPredicates.all;
 import static org.springframework.web.reactive.function.server.RouterFunctions.route;
@@ -99,7 +99,7 @@ private Mono<ServerResponse> override(ServerRequest request, ServerResponse resp
     Problem problem = Problem.builder().status(resolveStatus(response.statusCode())).build();
 
     Optional<ProblemContext> optionalContext =
-        request.attribute(PROBLEM_CONTEXT).map(context -> (ProblemContext) context);
+        request.attribute(PROBLEM_CONTEXT_ATTRIBUTE).map(context -> (ProblemContext) context);
     if (optionalContext.isPresent()) {
       ProblemContext context = optionalContext.get();
       problem = problemPostProcessor.process(context, problem);

problem4j-spring-webmvc/src/main/java/io/github/problem4j/spring/webmvc/ExceptionMvcAdvice.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webmvc;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
 import static io.github.problem4j.spring.web.util.ProblemSupport.resolveStatus;
 import static io.github.problem4j.spring.webmvc.MvcAdviceSupport.logAdviceException;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
@@ -87,7 +87,7 @@ public ExceptionMvcAdvice(
    */
   @ExceptionHandler(Exception.class)
   public ResponseEntity<Object> handleException(Exception ex, WebRequest request) {
-    ProblemContext context = (ProblemContext) request.getAttribute(PROBLEM_CONTEXT, SCOPE_REQUEST);
+    ProblemContext context = (ProblemContext) request.getAttribute(PROBLEM_CONTEXT_ATTRIBUTE, SCOPE_REQUEST);
     if (context == null) {
       context = ProblemContext.create();
     }

problem4j-spring-webmvc/src/main/java/io/github/problem4j/spring/webmvc/MvcAdviceSupport.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webmvc;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.TRACE_ID;
+import static io.github.problem4j.spring.web.context.AttributeSupport.TRACE_ID_ATTRIBUTE;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
 
 import org.slf4j.Logger;
@@ -32,7 +32,7 @@ static void logAdviceException(Logger log, Exception ex, WebRequest request, Exc
       method = String.valueOf(req.getHttpMethod());
       endpoint = req.getRequest().getRequestURI();
 
-      Object traceIdAttr = req.getAttribute(TRACE_ID, SCOPE_REQUEST);
+      Object traceIdAttr = req.getAttribute(TRACE_ID_ATTRIBUTE, SCOPE_REQUEST);
       if (traceIdAttr != null) {
         traceId = traceIdAttr.toString();
       }

problem4j-spring-webmvc/src/main/java/io/github/problem4j/spring/webmvc/ProblemEnhancedMvcHandler.java

@@ -14,7 +14,7 @@
  */
 package io.github.problem4j.spring.webmvc;
 
-import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT;
+import static io.github.problem4j.spring.web.context.AttributeSupport.PROBLEM_CONTEXT_ATTRIBUTE;
 import static io.github.problem4j.spring.web.util.ProblemSupport.resolveStatus;
 import static io.github.problem4j.spring.webmvc.MvcAdviceSupport.logAdviceException;
 import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
@@ -83,7 +83,7 @@ public ProblemEnhancedMvcHandler(
   @Override
   protected ResponseEntity<Object> handleExceptionInternal(
       Exception ex, Object body, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
-    ProblemContext context = (ProblemContext) request.getAttribute(PROBLEM_CONTEXT, SCOPE_REQUEST);
+    ProblemContext context = (ProblemContext) request.getAttribute(PROBLEM_CONTEXT_ATTRIBUTE, SCOPE_REQUEST);
     if (context == null) {
       context = ProblemContext.create();
     }