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 549e4d5 Remove redundancy in HttpPart annotations.
549e4d5 is described below
commit 549e4d543eb7751d7b9a5ec37f48d519632dd19d
Author: JamesBognar <[email protected]>
AuthorDate: Sat Nov 20 11:04:35 2021 -0500
Remove redundancy in HttpPart annotations.
---
.../src/main/java/org/apache/juneau/Context.java | 2 +-
.../java/org/apache/juneau/html/HtmlSchemaDocSerializer.java | 2 +-
.../main/java/org/apache/juneau/html/HtmlSchemaSerializer.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Body.java | 1 -
.../java/org/apache/juneau/http/annotation/BodyAnnotation.java | 1 -
.../juneau/{jsonschema => http}/annotation/ExternalDocs.java | 2 +-
.../annotation/ExternalDocsAnnotation.java | 2 +-
.../main/java/org/apache/juneau/http/annotation/FormData.java | 1 -
.../org/apache/juneau/http/annotation/FormDataAnnotation.java | 1 -
.../java/org/apache/juneau/http/annotation/HasFormData.java | 6 +++---
.../main/java/org/apache/juneau/http/annotation/HasQuery.java | 10 +++++-----
.../main/java/org/apache/juneau/http/annotation/Header.java | 1 -
.../org/apache/juneau/http/annotation/HeaderAnnotation.java | 1 -
.../apache/juneau/{jsonschema => http}/annotation/Items.java | 2 +-
.../{jsonschema => http}/annotation/ItemsAnnotation.java | 4 ++--
.../src/main/java/org/apache/juneau/http/annotation/Path.java | 1 -
.../java/org/apache/juneau/http/annotation/PathAnnotation.java | 1 -
.../src/main/java/org/apache/juneau/http/annotation/Query.java | 1 -
.../org/apache/juneau/http/annotation/QueryAnnotation.java | 1 -
.../main/java/org/apache/juneau/http/annotation/Response.java | 1 -
.../org/apache/juneau/http/annotation/ResponseAnnotation.java | 1 -
.../java/org/apache/juneau/http/annotation/ResponseHeader.java | 1 -
.../juneau/http/annotation/ResponseHeaderAnnotation.java | 1 -
.../apache/juneau/{jsonschema => http}/annotation/Schema.java | 5 +++--
.../{jsonschema => http}/annotation/SchemaAnnotation.java | 2 +-
.../juneau/{jsonschema => http}/annotation/SubItems.java | 2 +-
.../{jsonschema => http}/annotation/SubItemsAnnotation.java | 4 ++--
.../org/apache/juneau/{jsonschema => http}/annotation/Tag.java | 2 +-
.../juneau/{jsonschema => http}/annotation/TagAnnotation.java | 2 +-
.../main/java/org/apache/juneau/httppart/HttpPartSchema.java | 1 -
.../main/java/org/apache/juneau/json/JsonSchemaSerializer.java | 2 +-
.../apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java | 2 +-
.../java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java | 2 +-
.../java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java | 2 +-
.../apache/juneau/jsonschema/JsonSchemaGeneratorSession.java | 2 +-
.../src/main/java/org/apache/juneau/oapi/OpenApiParser.java | 6 +++---
.../main/java/org/apache/juneau/oapi/OpenApiSerializer.java | 6 +++---
.../java/org/apache/juneau/oapi/annotation/OpenApiConfig.java | 4 ++--
.../org/apache/juneau/examples/rest/RequestEchoResource.java | 1 -
.../org/apache/juneau/examples/rest/dto/AtomFeedResource.java | 2 --
.../apache/juneau/examples/rest/dto/JsonSchemaResource.java | 2 --
.../juneau/microservice/resources/DirectoryResource.java | 2 +-
.../org/apache/juneau/microservice/resources/LogsResource.java | 2 +-
.../main/java/org/apache/juneau/rest/client/RestClient.java | 4 ++--
.../org/apache/juneau/rest/BasicSwaggerProviderSession.java | 5 -----
.../main/java/org/apache/juneau/rest/annotation/OpSwagger.java | 2 +-
.../org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java | 2 +-
.../main/java/org/apache/juneau/rest/annotation/Swagger.java | 1 -
.../org/apache/juneau/rest/annotation/SwaggerAnnotation.java | 1 -
.../java/org/apache/juneau/rest/beans/ResourceDescription.java | 1 -
.../apache/juneau/http/annotation/AnnotationUtils_Test.java | 1 -
.../org/apache/juneau/http/annotation/BodyAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/FormDataAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/HeaderAnnotation_Test.java | 1 -
.../org/apache/juneau/http/annotation/PathAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/QueryAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/ResponseAnnotation_Test.java | 1 -
.../juneau/http/annotation/ResponseHeaderAnnotation_Test.java | 1 -
.../org/apache/juneau/http/annotation/TagAnnotation_Test.java | 1 -
.../juneau/http/remote/Remote_FormDataAnnotation_Test.java | 1 -
.../juneau/http/remote/Remote_HeaderAnnotation_Test.java | 2 --
.../apache/juneau/http/remote/Remote_PathAnnotation_Test.java | 1 -
.../apache/juneau/http/remote/Remote_QueryAnnotation_Test.java | 1 -
.../org/apache/juneau/httppart/HttpPartSchema_Body_Test.java | 3 ---
.../apache/juneau/httppart/HttpPartSchema_FormData_Test.java | 2 --
.../org/apache/juneau/httppart/HttpPartSchema_Header_Test.java | 2 --
.../org/apache/juneau/httppart/HttpPartSchema_Path_Test.java | 2 --
.../org/apache/juneau/httppart/HttpPartSchema_Query_Test.java | 2 --
.../juneau/httppart/HttpPartSchema_ResponseHeader_Test.java | 2 --
.../apache/juneau/httppart/HttpPartSchema_Response_Test.java | 3 ---
.../org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java | 2 +-
.../jsonschema/annotation/ExternalDocsAnnotation_Test.java | 1 +
.../juneau/jsonschema/annotation/ItemsAnnotation_Test.java | 1 +
.../juneau/jsonschema/annotation/SchemaAnnotation_Test.java | 1 +
.../juneau/jsonschema/annotation/SubItemsAnnotation_Test.java | 1 +
.../src/test/java/org/apache/juneau/rest/Swagger_Test.java | 3 +--
.../juneau/rest/annotation/OpSwaggerAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/Query_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/Response_Test.java | 3 +--
.../apache/juneau/rest/annotation/SwaggerAnnotation_Test.java | 1 -
.../org/apache/juneau/rest/annotation/Swagger_Body_Test.java | 3 +--
.../apache/juneau/rest/annotation/Swagger_Response_Test.java | 2 --
82 files changed, 53 insertions(+), 113 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index be9ffe6..b27fcc7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -539,7 +539,7 @@ public abstract class Context implements MetaProvider {
* <li class='ja'>{@link
org.apache.juneau.html.annotation.HtmlAnnotation}
* <li class='ja'>{@link
org.apache.juneau.jso.annotation.JsoAnnotation}
* <li class='ja'>{@link
org.apache.juneau.json.annotation.JsonAnnotation}
- * <li class='ja'>{@link
org.apache.juneau.jsonschema.annotation.SchemaAnnotation}
+ * <li class='ja'>{@link
org.apache.juneau.http.annotation.SchemaAnnotation}
* <li class='ja'>{@link
org.apache.juneau.msgpack.annotation.MsgPackAnnotation}
* <li class='ja'>{@link
org.apache.juneau.oapi.annotation.OpenApiAnnotation}
* <li class='ja'>{@link
org.apache.juneau.plaintext.annotation.PlainTextAnnotation}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 0542f70..7448f45 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -20,11 +20,11 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.utils.*;
import org.apache.juneau.xml.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index 07b7955..d538f48 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -22,11 +22,11 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.utils.*;
import org.apache.juneau.xml.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index 5c6059b..9efce0b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Schema;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
index a0c0329..2260d86 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
@@ -21,7 +21,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
index f75735a..a48af78 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocsAnnotation.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocsAnnotation.java
index 0f022e1..4863d74 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocsAnnotation.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.jsonschema.SchemaUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 27c4dc8..f1af73d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -18,7 +18,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.util.*;
-import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
index f2ea38c..c0a2410 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
@@ -22,7 +22,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
index 380833f..d20d9ed 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
@@ -31,7 +31,7 @@ import java.lang.annotation.*;
This annotation can be used to detect the existence of a parameter when
it's not set to a particular value.
</p>
<ul class='javatree'>
- <li class='ja'>{@link oaj.http.annotation.HasFormData}
+ <li class='ja'>{@link HasFormData}
</ul>
<h5 class='figure'>Example:</h5>
@@ -85,12 +85,12 @@ import java.lang.annotation.*;
<h5 class='topic'>Important note concerning FORM posts</h5>
<p>
- This annotation should not be combined with the {@link
oaj.http.annotation.Body @Body} annotation or {@link
oajr.RestRequest#getBody()} method
+ This annotation should not be combined with the {@link Body @Body}
annotation or {@code RestRequest.getBody()} method
for <c>application/x-www-form-urlencoded POST</c> posts, since it will
trigger the underlying servlet API to
parse the body content as key-value pairs, resulting in empty content.
</p>
<p>
- The {@link oaj.http.annotation.HasQuery @HasQuery} annotation can be
used to check for the existing of a URL parameter in the URL string
+ The {@link HasQuery @HasQuery} annotation can be used to check for the
existing of a URL parameter in the URL string
without triggering the servlet to drain the body content.
</p>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
index c4f0809..8349d44 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
@@ -29,17 +29,17 @@ import java.lang.annotation.*;
* <li>Arguments and argument-types of server-side
<ja>@RestOp</ja>-annotated methods.
* </ul>
<p>
- Identical to {@link oaj.http.annotation.HasFormData @HasFormData}, but
only checks the existing of the parameter in the URL string, not
+ Identical to {@link HasFormData @HasFormData}, but only checks the
existing of the parameter in the URL string, not
URL-encoded form posts.
</p>
<ul class='javatree'>
- <li class='ja'>{@link oaj.http.annotation.HasQuery}
+ <li class='ja'>{@link HasQuery}
</ul>
<p>
- Unlike {@link oaj.http.annotation.HasFormData @HasFormData}, using this
annotation does not result in the servlet reading the contents
+ Unlike {@link HasFormData @HasFormData}, using this annotation does not
result in the servlet reading the contents
of URL-encoded form posts.
- Therefore, this annotation can be used in conjunction with the {@link
oaj.http.annotation.Body @Body} annotation or
- {@link oajr.RestRequest#getBody()} method for
<c>application/x-www-form-urlencoded POST</c> calls.
+ Therefore, this annotation can be used in conjunction with the {@link
Body @Body} annotation or
+ {@code RestRequestgetBody()} method for
<c>application/x-www-form-urlencoded POST</c> calls.
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index 307d760..c2e7eb8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -18,7 +18,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.util.*;
-import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
index 93c258b..c940b22 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
@@ -22,7 +22,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
index 7ccfa85..dff958e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ItemsAnnotation.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ItemsAnnotation.java
index dba00b3..8ad851d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ItemsAnnotation.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static org.apache.juneau.internal.ArrayUtils.*;
@@ -94,7 +94,7 @@ public class ItemsAnnotation {
* @param a The annotation to check.
* @return <jk>true</jk> if the specified annotation contains all
default values.
*/
- public static boolean
empty(org.apache.juneau.jsonschema.annotation.Items a) {
+ public static boolean empty(org.apache.juneau.http.annotation.Items a) {
return a == null || DEFAULT.equals(a);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 48b15e0..fb95cfd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -18,7 +18,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.util.*;
-import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
index ab139da..265e684 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
@@ -22,7 +22,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index 95d8045..55dc6de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -18,7 +18,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import java.util.*;
-import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
index 7a4bece..814d253 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
@@ -22,7 +22,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
index 14df3af..682c880 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Schema;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.json.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
index 426affe..938c7a9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
@@ -23,7 +23,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
index 297e09c..07cae7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
index 00bae32..ca22657 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
@@ -23,7 +23,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
similarity index 95%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
index 5e10c87..69393ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
@@ -10,14 +10,14 @@
// * "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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
+import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.http.annotation.*;
import org.apache.juneau.oapi.*;
/**
@@ -75,6 +75,7 @@ import org.apache.juneau.oapi.*;
* </ul>
*/
@Documented
+@Target({PARAMETER,METHOD,TYPE,FIELD})
@Retention(RUNTIME)
@Repeatable(SchemaAnnotation.Array.class)
@ContextApply(SchemaAnnotation.Apply.class)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.java
index 8ada1dc..b70c341 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.java
index 6dfa925..fbe0e38 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItemsAnnotation.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItemsAnnotation.java
index 0f64dbd..a261c71 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItemsAnnotation.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.jsonschema.SchemaUtils.*;
@@ -97,7 +97,7 @@ public class SubItemsAnnotation {
* @param a The annotation to check.
* @return <jk>true</jk> if the specified annotation contains all
default values.
*/
- public static boolean
empty(org.apache.juneau.jsonschema.annotation.SubItems a) {
+ public static boolean empty(org.apache.juneau.http.annotation.SubItems
a) {
return a == null || DEFAULT.equals(a);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Tag.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Tag.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
index 6dc5a01..69c3353 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Tag.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/TagAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/TagAnnotation.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
index 8964b71..4b0f630 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/TagAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.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.jsonschema.annotation;
+package org.apache.juneau.http.annotation;
import static org.apache.juneau.internal.ArrayUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index ffbe580..80eb6c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -30,7 +30,6 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 9d3b0ff..1c682b9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -23,10 +23,10 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.utils.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
index 39cc499..9301045 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
@@ -16,7 +16,7 @@ import static org.apache.juneau.internal.ThrowableUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.parser.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
index 875399e..f23d87a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
@@ -16,7 +16,7 @@ import static org.apache.juneau.internal.ThrowableUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.parser.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index e6da1cb..d3d6827 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -27,10 +27,10 @@ import java.util.regex.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.utils.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index efbed0d..6e01bcf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -21,10 +21,10 @@ import java.util.regex.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.parser.ParseException;
import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index a433c1c..29d581b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -19,10 +19,10 @@ import java.util.*;
import java.util.concurrent.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.utils.*;
@@ -126,7 +126,7 @@ public class OpenApiParser extends UonParser implements
OpenApiMetaProvider {
* <i><l>OpenApiCommon</l> configuration property: </i>
Default format for HTTP parts.
*
* <p>
- * Specifies the format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#format()}.
+ * Specifies the format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#format()}.
*
* <p>
* Possible values:
@@ -181,7 +181,7 @@ public class OpenApiParser extends UonParser implements
OpenApiMetaProvider {
* <i><l>OpenApiCommon</l> configuration property: </i>
Default collection format for HTTP parts.
*
* <p>
- * Specifies the collection format to use for HTTP parts when
not otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#collectionFormat()}.
+ * Specifies the collection format to use for HTTP parts when
not otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#collectionFormat()}.
*
* <p>
* Possible values:
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index 8d07dda..55454c0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -19,10 +19,10 @@ import java.util.*;
import java.util.concurrent.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.utils.*;
@@ -126,7 +126,7 @@ public class OpenApiSerializer extends UonSerializer
implements OpenApiMetaProvi
* <i><l>OpenApiCommon</l> configuration property: </i>
Default format for HTTP parts.
*
* <p>
- * Specifies the format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#format()}.
+ * Specifies the format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#format()}.
*
* <p>
* Possible values:
@@ -183,7 +183,7 @@ public class OpenApiSerializer extends UonSerializer
implements OpenApiMetaProvi
* <i><l>OpenApiCommon</l> configuration property: </i>
Default collection format for HTTP parts.
*
* <p>
- * Specifies the collection format to use for HTTP parts when
not otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#collectionFormat()}.
+ * Specifies the collection format to use for HTTP parts when
not otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#collectionFormat()}.
*
* <p>
* Possible values:
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
index 2f9bc45..05c0116 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
@@ -50,7 +50,7 @@ public @interface OpenApiConfig {
* Default format for HTTP parts.
*
* <p>
- * Specifies the format to use for HTTP parts when not otherwise
specified via {@link org.apache.juneau.jsonschema.annotation.Schema#format()}.
+ * Specifies the format to use for HTTP parts when not otherwise
specified via {@link org.apache.juneau.http.annotation.Schema#format()}.
*
* <p>
* Possible values:
@@ -83,7 +83,7 @@ public @interface OpenApiConfig {
* Configuration property: Default collection format for HTTP parts.
*
* <p>
- * Specifies the collection format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#collectionFormat()}.
+ * Specifies the collection format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#collectionFormat()}.
*
* <p>
* Possible values:
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index 990a988..0f2508a 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -15,7 +15,6 @@ package org.apache.juneau.examples.rest;
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.juneau.jsonschema.annotation.ExternalDocs;
import org.apache.juneau.annotation.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.annotation.*;
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
index 3025612..5799576 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
@@ -16,13 +16,11 @@ import static org.apache.juneau.dto.atom.AtomBuilder.*;
import java.net.URI;
-import org.apache.juneau.jsonschema.annotation.ExternalDocs;
import org.apache.juneau.annotation.*;
import org.apache.juneau.dto.atom.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.jena.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
index cda7a8c..67ff6ac 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
@@ -13,11 +13,9 @@
package org.apache.juneau.examples.rest.dto;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.jsonschema.annotation.ExternalDocs;
import org.apache.juneau.dto.jsonschema.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.widget.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 31c3a24..64e6d9f 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -25,7 +25,7 @@ import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.http.annotation.Response;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.Schema;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.beans.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 2fb1cd7..efc7a7c 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -25,7 +25,7 @@ import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.http.annotation.Query;
import org.apache.juneau.http.annotation.Response;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.Schema;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.beans.*;
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 eb1ef22..df79638 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
@@ -5486,7 +5486,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* <i><l>OpenApiCommon</l> configuration property: </i>
Default OpenAPI format for HTTP parts.
*
* <p>
- * Specifies the format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#format()} for
+ * Specifies the format to use for HTTP parts when not
otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#format()} for
* the OpenAPI serializer and parser on this client.
*
* <p>
@@ -5547,7 +5547,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* <i><l>OpenApiCommon</l> configuration property: </i>
Default collection format for HTTP parts.
*
* <p>
- * Specifies the collection format to use for HTTP parts when
not otherwise specified via {@link
org.apache.juneau.jsonschema.annotation.Schema#collectionFormat()} for the
+ * Specifies the collection format to use for HTTP parts when
not otherwise specified via {@link
org.apache.juneau.http.annotation.Schema#collectionFormat()} for the
* OpenAPI serializer and parser on this client.
*
* <p>
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
index 0d72c76..f2167b5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
@@ -27,15 +27,10 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.dto.swagger.Swagger;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.http.annotation.Contact;
-import org.apache.juneau.http.annotation.License;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.jsonschema.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.Tag;
import org.apache.juneau.marshall.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwagger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwagger.java
index f605c40..8c80db7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwagger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwagger.java
@@ -16,7 +16,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
/**
* Extended annotation for {@link RestOp#swagger() RestOp.swagger()}.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
index bd86be5..8d998f7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
@@ -17,7 +17,7 @@ import static org.apache.juneau.internal.ArrayUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
/**
* Utility classes and methods for the {@link OpSwagger @OpSwagger} annotation.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Swagger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Swagger.java
index 3a45648..670cb99 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Swagger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Swagger.java
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.*;
/**
* Extended annotation for {@link Rest#swagger() @Rest(swagger)}.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
index 414a7d2..7b375dc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
@@ -18,7 +18,6 @@ import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.*;
/**
* Utility classes and methods for the {@link Swagger @Swagger} annotation.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
index fb6f457..7ef46f8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ResourceDescription.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.internal.ObjectUtils.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Schema;
/**
* Shortcut label for child resources.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
index 3499eb9..9a3a576 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
@@ -21,7 +21,6 @@ import static org.apache.juneau.assertions.Assertions.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/BodyAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/BodyAnnotation_Test.java
index e8c379b..574e2c9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/BodyAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/BodyAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
index 6a075ee..def73c9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
index 1142960..f4574bb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
index 6e02942..abe38e6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
index 5c46eea..9eb7aa6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
index 3d734a1..663e7dc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation_Test.java
index bf67082..3d99d70 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.oapi.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
index 6afcaf3..2e5b235 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
index 461827f..4c2c688 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
@@ -29,7 +29,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.part.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index 546ffd8..ea3fa22 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -25,9 +25,7 @@ import java.util.concurrent.atomic.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.header.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
index f8ec8c9..8aae416 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
@@ -26,7 +26,6 @@ import org.apache.http.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.part.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
index 6850779..67c730d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
@@ -28,7 +28,6 @@ import org.apache.http.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.part.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
index 1861c0b..85c910f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
@@ -19,9 +19,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.Schema;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.reflect.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_FormData_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_FormData_Test.java
index 2c95a60..6900a0f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_FormData_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_FormData_Test.java
@@ -19,8 +19,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.reflect.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Header_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Header_Test.java
index 08447c0..abbc60c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Header_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Header_Test.java
@@ -21,8 +21,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.reflect.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Path_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Path_Test.java
index be6a7f0..cece36e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Path_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Path_Test.java
@@ -21,8 +21,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.reflect.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Query_Test.java
index 62a9335..e7ed05a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Query_Test.java
@@ -21,8 +21,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.reflect.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_ResponseHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_ResponseHeader_Test.java
index 8330a35..6f3cb1d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_ResponseHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_ResponseHeader_Test.java
@@ -21,8 +21,6 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.reflect.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
index 334c596..79f6ac2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
@@ -21,9 +21,6 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Items;
-import org.apache.juneau.jsonschema.annotation.Schema;
-import org.apache.juneau.jsonschema.annotation.SubItems;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
index 6e3bed1..2b42791 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
@@ -21,7 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.swap.*;
import org.apache.juneau.testutils.pojos.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
index 39ea5ec..9a22439 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
@@ -17,6 +17,7 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
index 19b796f..7d63389 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
@@ -17,6 +17,7 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
index aa9d1e2..fe2c9d1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
@@ -17,6 +17,7 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
index 1cb3c00..41fdaa0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
@@ -17,6 +17,7 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index 6b1fa2d..e842bd7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -20,8 +20,6 @@ import java.io.*;
import java.util.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.jsonschema.annotation.*;
-import org.apache.juneau.jsonschema.annotation.Tag;
import org.apache.juneau.xml.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
@@ -30,6 +28,7 @@ import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Contact;
import org.apache.juneau.http.annotation.License;
+import org.apache.juneau.http.annotation.Tag;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.annotation.Swagger;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
index 998d5e5..5bde4ee 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
index 15ab65f..ac11680 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
@@ -20,7 +20,6 @@ import java.util.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.client.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
index cbf0f93..6e97f20 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
@@ -18,9 +18,8 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.annotation.Response;
+import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.jsonschema.annotation.Schema;
import org.apache.juneau.oapi.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
index e6d85a1..b8d8dea 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
@@ -18,7 +18,6 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.jsonschema.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
index 4f75ce3..7b3a0b8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Body_Test.java
@@ -20,8 +20,7 @@ import static org.junit.runners.MethodSorters.*;
import java.util.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.http.annotation.Body;
-import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.http.annotation.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
index f0847cb..21f6b17 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Response_Test.java
@@ -22,8 +22,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.http.annotation.Response;
-import org.apache.juneau.jsonschema.annotation.Schema;
import org.junit.*;
@SuppressWarnings({"serial"})
