This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 6d9bc19 REST refactoring.
6d9bc19 is described below
commit 6d9bc1997fccc7fee6f6c4d8faecee7bfbaf6d04
Author: JamesBognar <[email protected]>
AuthorDate: Thu Mar 4 14:54:38 2021 -0500
REST refactoring.
---
.../java/org/apache/juneau/http/{ => entity}/BasicHttpResource.java | 3 +--
.../main/java/org/apache/juneau/http/{ => entity}/HttpResource.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/Accept.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/AcceptCharset.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/AcceptEncoding.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/AcceptLanguage.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/ClientVersion.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/Connection.java | 2 +-
.../src/main/java/org/apache/juneau/http/{ => header}/Constants.java | 4 ++--
.../main/java/org/apache/juneau/http/header/ContentDisposition.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/ContentType.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/MediaRanges.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/MediaType.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/StringRanges.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/TE.java | 2 +-
.../src/main/java/org/apache/juneau/rest/client/ResponseBody.java | 2 +-
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 1 -
.../src/main/java/org/apache/juneau/rest/client/RestRequest.java | 1 -
.../org/apache/juneau/rest/springboot/BasicSpringRestServlet.java | 2 +-
.../src/main/java/org/apache/juneau/rest}/BasicNamedAttribute.java | 2 +-
.../src/main/java/org/apache/juneau/rest/BasicRestObject.java | 2 +-
.../src/main/java/org/apache/juneau/rest/BasicRestOperations.java | 2 +-
.../src/main/java/org/apache/juneau/rest/BasicRestServlet.java | 2 +-
.../src/main/java/org/apache/juneau/rest/BasicStaticFiles.java | 2 +-
.../src/main/java/org/apache/juneau/rest}/NamedAttribute.java | 2 +-
.../src/main/java/org/apache/juneau/rest}/NamedAttributeList.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RequestAttribute.java | 1 -
.../src/main/java/org/apache/juneau/rest/RequestAttributes.java | 1 -
.../src/main/java/org/apache/juneau/rest/RestContext.java | 1 -
.../src/main/java/org/apache/juneau/rest/RestContextBuilder.java | 1 -
.../src/main/java/org/apache/juneau/rest/RestOperationContext.java | 1 -
.../main/java/org/apache/juneau/rest/RestOperationContextBuilder.java | 1 -
.../src/main/java/org/apache/juneau/rest/StaticFiles.java | 2 +-
.../main/java/org/apache/juneau/rest/annotation/RestAnnotation.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java | 1 -
.../main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 1 -
.../src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java | 3 ++-
.../test/java/org/apache/juneau/http/{ => header}/Constants_Test.java | 2 +-
.../org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java | 2 +-
.../src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java | 2 +-
.../org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java | 2 +-
.../test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java | 1 -
45 files changed, 32 insertions(+), 47 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/BasicHttpResource.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/BasicHttpResource.java
index 0bd98ef..33ee3c6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/BasicHttpResource.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.http.entity;
import static org.apache.juneau.internal.ObjectUtils.*;
@@ -20,7 +20,6 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.header.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResource.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/HttpResource.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResource.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/HttpResource.java
index 0b8a417..c73f36b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResource.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/HttpResource.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.http.entity;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Accept.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Accept.java
index 5eb4c37..139aca6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Accept.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Accept.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
index bbc4c2d..8952a94 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
index da355a0..8d98f4e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
index 11abb36..f3fd1dc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ClientVersion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ClientVersion.java
index 677bea7..6407a85 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ClientVersion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ClientVersion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Connection.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Connection.java
index b126f1e..75ad002 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Connection.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Connection.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Constants.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Constants.java
index 63eac25..b1dadb6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Constants.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.http.header;
/**
* Constants used by classes in this package.
@@ -19,7 +19,7 @@ package org.apache.juneau.http;
* <li class='extlink'>{@doc ExtRFC2616}
* </ul>
*/
-public class Constants {
+class Constants {
/** Use caching of HTTP artifacts. */
public static boolean NOCACHE =
Boolean.getBoolean("juneau.http.cache.disable");
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
index 7aabe88..40b8e7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
index 2fcd0e0..e93342c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentType.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
index 7048fbc..b9577ef 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaType.java
index db87975..861a209 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaType.java
@@ -12,10 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.http.HttpParts.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
index 61223fb..424e756 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
index 415983c..e37f1b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.http.Constants.*;
+import static org.apache.juneau.http.header.Constants.*;
import java.util.function.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseBody.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseBody.java
index 7e8eefb..768bc19 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseBody.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseBody.java
@@ -25,7 +25,7 @@ import org.apache.http.*;
import org.apache.http.conn.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 540831a..aaca745 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -53,7 +53,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.remote.RemoteReturn;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.part.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index afda7c8..6e4fefe 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -40,7 +40,6 @@ import org.apache.http.protocol.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.html.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.part.*;
diff --git
a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/BasicSpringRestServlet.java
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/BasicSpringRestServlet.java
index 094c401..54bc8a7 100644
---
a/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/BasicSpringRestServlet.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/BasicSpringRestServlet.java
@@ -17,8 +17,8 @@ import java.util.*;
import org.apache.juneau.dto.swagger.Swagger;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.jso.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicNamedAttribute.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicNamedAttribute.java
index 7a80a0f..865e526 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNamedAttribute.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicNamedAttribute.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.rest;
import static org.apache.juneau.internal.StringUtils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestObject.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestObject.java
index 17a8fb0..80a9fd6 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestObject.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestObject.java
@@ -19,8 +19,8 @@ import javax.servlet.http.*;
import org.apache.juneau.dto.swagger.Swagger;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.response.*;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestOperations.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestOperations.java
index 2985f75..c330854 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestOperations.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestOperations.java
@@ -20,8 +20,8 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.dto.swagger.Swagger;
import org.apache.juneau.dto.swagger.ui.*;
import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
index 352cd5e..bfa7a0c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
@@ -17,8 +17,8 @@ import java.util.*;
import org.apache.juneau.dto.swagger.Swagger;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.jso.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
index ea03af9..95e7e33 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
@@ -24,7 +24,7 @@ import javax.activation.*;
import org.apache.http.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.http.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NamedAttribute.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NamedAttribute.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NamedAttribute.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NamedAttribute.java
index 3b1bdbb..eda9e1f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NamedAttribute.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NamedAttribute.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.rest;
/**
* A simple named object.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NamedAttributeList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NamedAttributeList.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NamedAttributeList.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NamedAttributeList.java
index 9426125..de35146 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NamedAttributeList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NamedAttributeList.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.rest;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttribute.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttribute.java
index 37a7654..51de7ad 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttribute.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttribute.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.response.*;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttributes.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttributes.java
index ada8132..55d0d98 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttributes.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestAttributes.java
@@ -19,7 +19,6 @@ import java.util.*;
import javax.servlet.http.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.svl.*;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index aa7e8ba..e403586 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -46,7 +46,6 @@ import org.apache.juneau.dto.swagger.Swagger;
import org.apache.juneau.encoders.*;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.Response;
import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 9dbc023..6fda991 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -35,7 +35,6 @@ import org.apache.juneau.config.*;
import org.apache.juneau.config.vars.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
index 47328d9..c6a3123 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
@@ -41,7 +41,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.header.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
index 586085b..357e59b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
@@ -25,7 +25,6 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
index 77cc3d8..8971339 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
@@ -14,7 +14,7 @@ package org.apache.juneau.rest;
import java.util.*;
-import org.apache.juneau.http.*;
+import org.apache.juneau.http.entity.*;
/**
* API for retrieving localized static files from either the classpath or file
system.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index ff660cb..2ebe006 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -24,7 +24,6 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index 7bdacab..6bc9310 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -23,7 +23,6 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index 2edf3b8..c7b376a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -23,7 +23,6 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 8e72996..2e4e409 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -23,7 +23,6 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index e8498bf..642c802 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -23,7 +23,6 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 52c8e98..514594f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -23,7 +23,6 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index f479ad5..45cf3db 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -13,13 +13,14 @@
package org.apache.juneau.http;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.BasicHttpResource.*;
import static org.apache.juneau.http.HttpHeaders.*;
+import static org.apache.juneau.http.entity.BasicHttpResource.*;
import static org.junit.Assert.*;
import java.io.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.header.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/Constants_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Constants_Test.java
similarity index 97%
rename from
juneau-utest/src/test/java/org/apache/juneau/http/Constants_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/http/header/Constants_Test.java
index 5f5b6a8..a92ba49 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/Constants_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Constants_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http;
+package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
index d5dde09..a436801 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
@@ -20,10 +20,10 @@ import static org.junit.runners.MethodSorters.*;
import java.io.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.annotation.Query;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
index 110e041..c555869 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
@@ -24,7 +24,7 @@ import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
-import org.apache.juneau.http.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.response.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index 8471b4a..77a437b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -25,8 +25,8 @@ import org.apache.http.*;
import org.apache.http.client.utils.*;
import org.apache.http.entity.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.http.entity.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.marshall.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
index 9a819ef..59a98b3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
@@ -20,7 +20,6 @@ import java.io.*;
import java.util.*;
import org.apache.http.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.entity.*;
import org.apache.juneau.json.*;
import org.apache.juneau.rest.*;
