finatra: Move com.twitter.finatra.http.jsonpatch to finatra/http-core…

… project Problem/Solution: Move json patch from http-server to http-core Result: Also moved finatra/http-server/src/main/scala/com/twitter/finatra/http/request and the remaining files in finatra/http-server/src/main/java/ to http-core JIRA Issues: CSL-10670 Differential Revision: https://phabricator.twitter.biz/D623745
twitter · Mar 15, 2021 · f8a810b · f8a810b
1 parent c132a05
commit f8a810b
Show file tree

Hide file tree

Showing 37 changed files with 83 additions and 91 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -21,6 +21,9 @@ Breaking API Changes
 
 Changed
 ~~~~~~~
+* finatra: Move com.twitter.finatra.http.{jsonpatch,request} from the finatra/http-server project to
+  finatra/http-core project. Please update your build artifact references accordingly.
+  ``PHAB_ID=D623745``
 
 * http-server|http-core|jackson|thrift|validation: Update to use `c.t.util.reflect.Types`
   in places for TypeTag reflection. ``PHAB_ID=D631819``

diff --git a/benchmarks/src/test/scala/BUILD b/benchmarks/src/test/scala/BUILD
@@ -22,23 +22,23 @@ junit_tests(
         "finagle/finagle-http/src/main/scala",
         "finagle/finagle-stats/src/main/scala",
         "finatra/benchmarks/src/main/java",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
         "finatra/http-mustache/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/test/scala/com/twitter/inject/app",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",

diff --git a/examples/advanced/streaming-example/src/main/scala/BUILD b/examples/advanced/streaming-example/src/main/scala/BUILD
@@ -5,22 +5,22 @@ scala_library(
         "3rdparty/jvm/com/google/inject:guice",
         "3rdparty/jvm/org/slf4j:slf4j-api",
         "finatra/examples/advanced/streaming-example/src/main/resources",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",

diff --git a/examples/advanced/twitter-clone/src/main/scala/BUILD b/examples/advanced/twitter-clone/src/main/scala/BUILD
@@ -14,22 +14,22 @@ scala_library(
         "finatra/examples/advanced/twitter-clone/src/main/resources",
         "finatra/http-annotations/src/main/java/com/twitter/finatra/http/annotations",
         "finatra/http-client/src/main/scala",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/main/scala/com/twitter/inject/app",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",

diff --git a/examples/advanced/web-dashboard/src/main/scala/BUILD b/examples/advanced/web-dashboard/src/main/scala/BUILD
@@ -14,25 +14,25 @@ scala_library(
         "finagle/finagle-zipkin-scribe/src/main/scala",
         "finatra/examples/advanced/web-dashboard/src/main/resources",
         "finatra/examples/advanced/web-dashboard/src/main/webapp",
+        "finatra/http-core/src/main/java",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
         "finatra/http-mustache/src/main/java/com/twitter/finatra/http/annotations",
         "finatra/http-mustache/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/java",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",

diff --git a/examples/benchmark/src/main/scala/BUILD b/examples/benchmark/src/main/scala/BUILD
@@ -7,22 +7,22 @@ scala_library(
         "3rdparty/jvm/com/google/inject:guice",
         "finagle/finagle-core/src/main",
         "finagle/finagle-http/src/main/scala",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",

diff --git a/examples/http-server/java/src/main/java/com/twitter/finatra/example/BUILD b/examples/http-server/java/src/main/java/com/twitter/finatra/example/BUILD
@@ -5,23 +5,23 @@ java_library(
         "3rdparty/jvm/com/google/inject:guice",
         "finagle/finagle-base-http/src/main",
         "finagle/finagle-core/src/main",
+        "finatra/http-core/src/main/java",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
-        "finatra/http-server/src/main/java",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",

diff --git a/examples/http-server/scala/src/main/scala/com/twitter/finatra/example/BUILD b/examples/http-server/scala/src/main/scala/com/twitter/finatra/example/BUILD
@@ -5,22 +5,22 @@ scala_library(
         "3rdparty/jvm/com/google/inject:guice",
         "3rdparty/jvm/org/slf4j:slf4j-api",
         "finagle/finagle-http/src/main/scala",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/streaming",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http:controller",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/conversions",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/filters",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/jsonpatch",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/modules",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",

diff --git a/http-server/src/main/java/BUILD → http-core/src/main/java/BUILD b/http-server/src/main/java/BUILD → http-core/src/main/java/BUILD
@@ -11,13 +11,13 @@ java_library(
         "deprecated",
     ],
     dependencies = [
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
     ],
     exports = [
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
     ],
 )
diff --git a/.../main/java/com/twitter/finatra/http/BUILD → .../main/java/com/twitter/finatra/http/BUILD b/.../main/java/com/twitter/finatra/http/BUILD → .../main/java/com/twitter/finatra/http/BUILD
diff --git a/...om/twitter/finatra/http/JavaCallback.java → ...om/twitter/finatra/http/JavaCallback.java b/...om/twitter/finatra/http/JavaCallback.java → ...om/twitter/finatra/http/JavaCallback.java
diff --git a/.../com/twitter/finatra/http/jsonpatch/BUILD → .../com/twitter/finatra/http/jsonpatch/BUILD b/.../com/twitter/finatra/http/jsonpatch/BUILD → .../com/twitter/finatra/http/jsonpatch/BUILD
diff --git a/...itter/finatra/http/jsonpatch/Operand.java → ...itter/finatra/http/jsonpatch/Operand.java b/...itter/finatra/http/jsonpatch/Operand.java → ...itter/finatra/http/jsonpatch/Operand.java
diff --git a/.../com/twitter/finatra/http/jsonpatch/BUILD → .../com/twitter/finatra/http/jsonpatch/BUILD b/.../com/twitter/finatra/http/jsonpatch/BUILD → .../com/twitter/finatra/http/jsonpatch/BUILD
@@ -12,17 +12,17 @@ scala_library(
         "3rdparty/jvm/com/fasterxml/jackson/core:jackson-databind",
         "3rdparty/jvm/javax/inject:javax.inject",
         "finagle/finagle-base-http/src/main",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/marshalling",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/jackson/src/main/scala",
     ],
     exports = [
         "3rdparty/jvm/com/fasterxml/jackson/core:jackson-core",
         "3rdparty/jvm/com/fasterxml/jackson/core:jackson-databind",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http/jsonpatch",
         "finatra/jackson/src/main/scala",
     ],
 )
diff --git a/...er/finatra/http/jsonpatch/JsonPatch.scala → ...er/finatra/http/jsonpatch/JsonPatch.scala b/...er/finatra/http/jsonpatch/JsonPatch.scala → ...er/finatra/http/jsonpatch/JsonPatch.scala
diff --git a/...a/http/jsonpatch/JsonPatchException.scala → ...a/http/jsonpatch/JsonPatchException.scala b/...a/http/jsonpatch/JsonPatchException.scala → ...a/http/jsonpatch/JsonPatchException.scala
diff --git a/.../jsonpatch/JsonPatchExceptionMapper.scala → .../jsonpatch/JsonPatchExceptionMapper.scala b/.../jsonpatch/JsonPatchExceptionMapper.scala → .../jsonpatch/JsonPatchExceptionMapper.scala
diff --git a/...sonpatch/JsonPatchMessageBodyReader.scala → ...sonpatch/JsonPatchMessageBodyReader.scala b/...sonpatch/JsonPatchMessageBodyReader.scala → ...sonpatch/JsonPatchMessageBodyReader.scala
diff --git a/...ra/http/jsonpatch/JsonPatchOperator.scala → ...ra/http/jsonpatch/JsonPatchOperator.scala b/...ra/http/jsonpatch/JsonPatchOperator.scala → ...ra/http/jsonpatch/JsonPatchOperator.scala
diff --git a/...tra/http/jsonpatch/JsonPatchUtility.scala → ...tra/http/jsonpatch/JsonPatchUtility.scala b/...tra/http/jsonpatch/JsonPatchUtility.scala → ...tra/http/jsonpatch/JsonPatchUtility.scala
diff --git a/...natra/http/jsonpatch/PatchOperation.scala → ...natra/http/jsonpatch/PatchOperation.scala b/...natra/http/jsonpatch/PatchOperation.scala → ...natra/http/jsonpatch/PatchOperation.scala
diff --git a/http-core/src/main/scala/com/twitter/finatra/http/request/BUILD b/http-core/src/main/scala/com/twitter/finatra/http/request/BUILD
@@ -5,9 +5,21 @@ scala_library(
         name = "finatra-http-core-request",
         repo = artifactory,
     ),
+    strict_deps = "True",
     dependencies = [
+        "finagle/finagle-base-http/src/main",
         "finagle/finagle-core/src/main",
         "finagle/finagle-http/src/main/scala",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/fileupload",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
+        "finatra/inject/inject-utils/src/main/scala",
         "util/util-core:scala",
     ],
+    exports = [
+        "finagle/finagle-base-http/src/main",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http/request",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
+    ],
 )
diff --git a/...natra/http/request/ForwardedRequest.scala → ...natra/http/request/ForwardedRequest.scala b/...natra/http/request/ForwardedRequest.scala → ...natra/http/request/ForwardedRequest.scala
diff --git a/...ter/finatra/http/request/MediaRange.scala → ...ter/finatra/http/request/MediaRange.scala b/...ter/finatra/http/request/MediaRange.scala → ...ter/finatra/http/request/MediaRange.scala
diff --git a/...r/finatra/http/request/RequestUtils.scala → ...r/finatra/http/request/RequestUtils.scala b/...r/finatra/http/request/RequestUtils.scala → ...r/finatra/http/request/RequestUtils.scala
diff --git a/...witter/finatra/http/request/package.scala → ...witter/finatra/http/request/package.scala b/...witter/finatra/http/request/package.scala → ...witter/finatra/http/request/package.scala
diff --git a/http-server/src/main/scala/com/twitter/finatra/http/BUILD b/http-server/src/main/scala/com/twitter/finatra/http/BUILD
@@ -63,21 +63,21 @@ scala_library(
         "3rdparty/jvm/javax/inject:javax.inject",
         "finagle/finagle-core/src/main",
         "finagle/finagle-http/src/main/scala",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/internal/routing",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "util/util-core:util-core-util",
     ],
     exports = [
         "finagle/finagle-core/src/main",
         "finagle/finagle-http/src/main/scala",
+        "finatra/http-core/src/main/java/com/twitter/finatra/http",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/http-server/src/main/java/com/twitter/finatra/http",
         "finatra/http-server/src/main/scala/com/twitter/finatra/http/internal/routing",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
     ],
 )
diff --git a/http-server/src/main/scala/com/twitter/finatra/http/filters/BUILD b/http-server/src/main/scala/com/twitter/finatra/http/filters/BUILD
@@ -13,8 +13,8 @@ scala_library(
         "finagle/finagle-core/src/main",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/contexts",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/exceptions",
+        "finatra/http-core/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http-core/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/http-server/src/main/scala/com/twitter/finatra/http/request",
         "finatra/inject/inject-mdc/src/main/scala",
         "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/utils/src/main/scala/com/twitter/finatra/filters",