refactor: Move static Request accessors to internal LegacyRequestAccess

Author: thced

src/main/java/com/retailsvc/http/internal/DispatchHandler.java

@@ -1,7 +1,6 @@
 package com.retailsvc.http.internal;
 
 import com.retailsvc.http.MissingOperationHandlerException;
-import com.retailsvc.http.Request;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import java.io.IOException;
@@ -16,7 +15,7 @@ public DispatchHandler(Map<String, HttpHandler> handlers) {
 
   @Override
   public void handle(HttpExchange exchange) throws IOException {
-    String opId = Request.operationId();
+    String opId = LegacyRequestAccess.operationId();
     HttpHandler h = handlers.get(opId);
     if (h == null) {
       throw new MissingOperationHandlerException(opId);

…ain/java/com/retailsvc/http/Request.java …c/http/internal/LegacyRequestAccess.javasrc/main/java/com/retailsvc/http/Request.java renamed to src/main/java/com/retailsvc/http/internal/LegacyRequestAccess.java src/main/java/com/retailsvc/http/Request.java renamed to src/main/java/com/retailsvc/http/internal/LegacyRequestAccess.java

@@ -1,6 +1,5 @@
-package com.retailsvc.http;
+package com.retailsvc.http.internal;
 
-import com.retailsvc.http.internal.RequestContext;
 import java.util.Map;
 
 /**
@@ -13,13 +12,16 @@
  * <p>If a handler dispatches work to a non-structured executor (i.e. not a {@code
  * StructuredTaskScope}-managed thread), it must capture the values it needs before submitting — the
  * {@link ScopedValue} is not visible from arbitrary worker threads.
+ *
+ * @deprecated Temporary scaffolding; will be deleted in a future task.
  */
-public final class Request {
+@Deprecated
+public final class LegacyRequestAccess {
 
   /** Bound by {@code RequestPreparationFilter} for the duration of each request. */
   public static final ScopedValue<RequestContext> CONTEXT = ScopedValue.newInstance();
 
-  private Request() {}
+  private LegacyRequestAccess() {}
 
   /**
    * Returns the full per-request context. Use this when a handler reads more than one field — every

src/main/java/com/retailsvc/http/internal/RequestContext.java

@@ -6,8 +6,8 @@
 
 /**
  * Immutable per-request data populated by {@link RequestPreparationFilter} and read by handlers via
- * {@link com.retailsvc.http.Request}. Bound to a {@link ScopedValue} for the duration of a single
- * request — never written to the {@code HttpExchange}'s context-shared attribute map.
+ * {@link LegacyRequestAccess}. Bound to a {@link ScopedValue} for the duration of a single request
+ * — never written to the {@code HttpExchange}'s context-shared attribute map.
  *
  * <p>{@code equals}, {@code hashCode}, and {@code toString} are overridden because the record
  * carries a {@code byte[]} component: the auto-generated implementations use reference equality on

src/main/java/com/retailsvc/http/internal/RequestPreparationFilter.java

@@ -2,7 +2,6 @@
 
 import com.retailsvc.http.MethodNotAllowedException;
 import com.retailsvc.http.NotFoundException;
-import com.retailsvc.http.Request;
 import com.retailsvc.http.TypeMapper;
 import com.retailsvc.http.ValidationException;
 import com.retailsvc.http.spec.HttpMethod;
@@ -71,7 +70,7 @@ public void doFilter(HttpExchange exchange, Chain chain) throws IOException {
   private static void runWithRequestContext(RequestContext ctx, IORunnable work)
       throws IOException {
     try {
-      ScopedValue.where(Request.CONTEXT, ctx)
+      ScopedValue.where(LegacyRequestAccess.CONTEXT, ctx)
           .call(
               () -> {
                 work.run();

src/test/java/com/retailsvc/http/RequestTest.java

@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import com.retailsvc.http.internal.LegacyRequestAccess;
 import com.retailsvc.http.internal.RequestContext;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -21,13 +22,13 @@ void readsBoundContext() throws Exception {
     AtomicReference<String> seenOpId = new AtomicReference<>();
     AtomicReference<Map<String, String>> seenPathParams = new AtomicReference<>();
 
-    ScopedValue.where(Request.CONTEXT, ctx)
+    ScopedValue.where(LegacyRequestAccess.CONTEXT, ctx)
         .call(
             () -> {
-              seenBytes.set(Request.bytes());
-              seenParsed.set(Request.parsed());
-              seenOpId.set(Request.operationId());
-              seenPathParams.set(Request.pathParams());
+              seenBytes.set(LegacyRequestAccess.bytes());
+              seenParsed.set(LegacyRequestAccess.parsed());
+              seenOpId.set(LegacyRequestAccess.operationId());
+              seenPathParams.set(LegacyRequestAccess.pathParams());
               return null;
             });
 
@@ -39,6 +40,6 @@ void readsBoundContext() throws Exception {
 
   @Test
   void readingOutsideScopeThrows() {
-    assertThrows(NoSuchElementException.class, Request::bytes);
+    assertThrows(NoSuchElementException.class, LegacyRequestAccess::bytes);
   }
 }

src/test/java/com/retailsvc/http/TypeMapperRegistrationTest.java

@@ -6,6 +6,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.retailsvc.http.internal.LegacyRequestAccess;
 import com.sun.net.httpserver.HttpHandler;
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -24,7 +25,7 @@ class TypeMapperRegistrationTest extends ServerBaseTest {
   void gsonFallbackIsAutoRegisteredWhenNoJsonMapperConfigured() throws Exception {
     HttpHandler echo =
         ex -> {
-          Object parsed = Request.parsed();
+          Object parsed = LegacyRequestAccess.parsed();
           byte[] out = gson.toJson(parsed).getBytes(StandardCharsets.UTF_8);
           ex.getResponseHeaders().add("Content-Type", "application/json");
           ex.sendResponseHeaders(200, out.length);

src/test/java/com/retailsvc/http/internal/DispatchHandlerTest.java

@@ -4,7 +4,6 @@
 import static org.mockito.Mockito.mock;
 
 import com.retailsvc.http.MissingOperationHandlerException;
-import com.retailsvc.http.Request;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import java.util.Map;
@@ -16,7 +15,7 @@ class DispatchHandlerTest {
   private static void withOperationId(
       String operationId, ScopedValue.CallableOp<Void, Exception> body) throws Exception {
     RequestContext ctx = new RequestContext(new byte[0], null, operationId, Map.of());
-    ScopedValue.where(Request.CONTEXT, ctx).call(body);
+    ScopedValue.where(LegacyRequestAccess.CONTEXT, ctx).call(body);
   }
 
   @Test

src/test/java/com/retailsvc/http/internal/RequestPreparationFilterTest.java

@@ -6,7 +6,6 @@
 
 import com.retailsvc.http.MethodNotAllowedException;
 import com.retailsvc.http.NotFoundException;
-import com.retailsvc.http.Request;
 import com.retailsvc.http.TypeMapper;
 import com.retailsvc.http.ValidationException;
 import com.retailsvc.http.spec.HttpMethod;
@@ -100,8 +99,8 @@ void successPathBindsRequestContextDuringChain() throws Exception {
     Filter.Chain chain = mock(Filter.Chain.class);
     Mockito.doAnswer(
             inv -> {
-              seenOpId.set(Request.operationId());
-              seenPathParams.set(Request.pathParams());
+              seenOpId.set(LegacyRequestAccess.operationId());
+              seenPathParams.set(LegacyRequestAccess.pathParams());
               return null;
             })
         .when(chain)

src/test/java/com/retailsvc/http/start/EchoHandler.java

@@ -1,6 +1,6 @@
 package com.retailsvc.http.start;
 
-import com.retailsvc.http.Request;
+import com.retailsvc.http.internal.LegacyRequestAccess;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import java.io.IOException;
@@ -15,7 +15,7 @@ public class EchoHandler implements HttpHandler {
 
   @Override
   public void handle(HttpExchange exchange) throws IOException {
-    byte[] bytes = Request.bytes();
+    byte[] bytes = LegacyRequestAccess.bytes();
 
     if (bytes.length == 0) {
       LOG.debug("No bytes available to read from the request body");

src/test/java/com/retailsvc/http/start/FormEchoHandler.java

@@ -2,7 +2,7 @@
 
 import static java.net.HttpURLConnection.HTTP_OK;
 
-import com.retailsvc.http.Request;
+import com.retailsvc.http.internal.LegacyRequestAccess;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import java.io.IOException;
@@ -13,7 +13,7 @@ public class FormEchoHandler implements HttpHandler {
 
   @Override
   public void handle(HttpExchange exchange) throws IOException {
-    Object parsed = Request.parsed();
+    Object parsed = LegacyRequestAccess.parsed();
     byte[] body = String.valueOf(parsed).getBytes(StandardCharsets.UTF_8);
     try (exchange) {
       exchange.getResponseHeaders().add("Content-Type", "text/plain; charset=utf-8");