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 e41e0de850 org.apache.juneau.common.reflect API improvements
e41e0de850 is described below
commit e41e0de850f081ef97fea48202cfb50e9bfd862a
Author: James Bognar <[email protected]>
AuthorDate: Mon Nov 24 07:44:01 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../apache/juneau/common}/annotation/TargetedAnnotationBuilder.java | 4 +---
.../apache/juneau/common}/annotation/TargetedAnnotationCBuilder.java | 2 +-
.../org/apache/juneau/common}/annotation/TargetedAnnotationImpl.java | 4 +---
.../apache/juneau/common}/annotation/TargetedAnnotationMBuilder.java | 2 +-
.../apache/juneau/common}/annotation/TargetedAnnotationMFBuilder.java | 2 +-
.../juneau/common}/annotation/TargetedAnnotationMFCBuilder.java | 2 +-
.../apache/juneau/common}/annotation/TargetedAnnotationTBuilder.java | 2 +-
.../org/apache/juneau/common}/annotation/TargetedAnnotationTImpl.java | 2 +-
.../apache/juneau/common}/annotation/TargetedAnnotationTMBuilder.java | 2 +-
.../juneau/common}/annotation/TargetedAnnotationTMFBuilder.java | 2 +-
.../juneau/common}/annotation/TargetedAnnotationTMFCBuilder.java | 2 +-
.../main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/BeanAnnotation.java | 1 +
.../main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/BeancAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java | 1 +
.../main/java/org/apache/juneau/annotation/MarshalledAnnotation.java | 1 +
.../java/org/apache/juneau/annotation/NamePropertyAnnotation.java | 1 +
.../java/org/apache/juneau/annotation/ParentPropertyAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/SwapAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/annotation/UriAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java | 1 +
.../main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java | 1 +
.../java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java | 1 +
.../java/org/apache/juneau/http/annotation/ContentAnnotation.java | 1 +
.../java/org/apache/juneau/http/annotation/FormDataAnnotation.java | 1 +
.../main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java | 1 +
.../main/java/org/apache/juneau/http/annotation/PathAnnotation.java | 1 +
.../org/apache/juneau/http/annotation/PathRemainderAnnotation.java | 1 +
.../main/java/org/apache/juneau/http/annotation/QueryAnnotation.java | 1 +
.../java/org/apache/juneau/http/annotation/RequestAnnotation.java | 1 +
.../java/org/apache/juneau/http/annotation/ResponseAnnotation.java | 1 +
.../java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java | 1 +
.../main/java/org/apache/juneau/json/annotation/JsonAnnotation.java | 1 +
.../java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java | 1 +
.../java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java | 1 +
.../org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java | 1 +
.../java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java | 1 +
.../apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java | 1 +
.../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/RestDestroyAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestInitAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java | 1 +
.../main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 1 +
.../org/apache/juneau/rest/annotation/RestPostCallAnnotation.java | 1 +
.../org/apache/juneau/rest/annotation/RestPostInitAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java | 1 +
.../java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 1 +
.../org/apache/juneau/rest/annotation/RestStartCallAnnotation.java | 1 +
59 files changed, 59 insertions(+), 15 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationBuilder.java
similarity index 94%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationBuilder.java
index d4e680d1d2..136f4dde7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationBuilder.java
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
-import org.apache.juneau.common.annotation.*;
-
/**
* Builder for {@link TargetedAnnotationImpl} objects.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationCBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationCBuilder.java
index a26099cdf6..26dd3ff4f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationCBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationImpl.java
similarity index 94%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationImpl.java
index 25fccaf00a..6922bac746 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationImpl.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.utils.CollectionUtils.*;
-import org.apache.juneau.common.annotation.*;
-
/**
* An implementation of an annotation that has an <code>on</code> value
targeting classes/methods/fields/constructors.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMBuilder.java
index 0827a48d23..2ab9601fe0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMFBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMFBuilder.java
index 8896fa1afa..46c58fbabf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMFBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMFCBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMFCBuilder.java
index 4ae9437393..720f838fcf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationMFCBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTBuilder.java
index 2acefc3121..70a29566b0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.utils.CollectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTImpl.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTImpl.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTImpl.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTImpl.java
index 9a5de2923c..cf1f6c1f15 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTImpl.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.utils.CollectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMBuilder.java
index c107ea22c6..895506ed32 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMFBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMFBuilder.java
index 22faf5206b..c728e8d424 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMFBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMFCBuilder.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMFCBuilder.java
index 856d0b399c..46fb297921 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/TargetedAnnotationTMFCBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.annotation;
+package org.apache.juneau.common.annotation;
import static org.apache.juneau.common.reflect.ReflectionUtils.*;
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
index d4ce015975..ef8ca2efa2 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
@@ -26,6 +26,7 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.jena.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
index a676942699..b046b32b95 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.swap.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
index b19e77bbfa..8fe73d0a1d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
index f69d8dd26b..63fd837072 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
index 72afd47c36..e33e127d6e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
index aca9ebcc2f..17a84456d6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
index 1ddcd31717..7061b7b6f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
index 910a7ef831..4d43b211d5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
index 2854421740..1ad6f9e4ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
index ead2c28c42..c022cf00b7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
@@ -29,6 +29,7 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.parser.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
index 831a53fe0c..ba1fe9a124 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
index 9f1619b405..505fe70a0c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
@@ -23,6 +23,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
index 645812ca48..40d0f8dcbc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
index a76ee69c22..e01a444cf1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
@@ -25,6 +25,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.html.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
index c1f88bed40..9189576d47 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
index 0bd960e9bf..bde7c150af 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
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 65a515d97f..804711adec 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
@@ -28,6 +28,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
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 23664674f3..f67f00529c 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
@@ -28,6 +28,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
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 e341367d0b..31af11282e 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
@@ -29,6 +29,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
index 044fa56d22..d67cf520fb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
@@ -27,6 +27,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
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 996e06e4b4..4c13ee93c7 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
@@ -28,6 +28,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
index 02a8b44696..d3c49e924d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
@@ -25,6 +25,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
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 ac0c9ca41c..91cf0ba480 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
@@ -25,6 +25,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
index e40c209c6b..38868404b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
@@ -25,6 +25,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
index bffffdd8d2..b11cd70ce5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
index db02cea78d..06a68eba99 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
index e4a043ee03..0eea282ddb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
index 6edb1c48b9..5603a3785e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
index 9491b3ae82..b8e2d8b751 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
index 15b5ace3db..10a59d3b1c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
index fd91c924a3..55fbdd2000 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
index a4c5052f82..87e09ecf70 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
@@ -24,6 +24,7 @@ import java.lang.annotation.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.svl.*;
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 e0e750216f..36ce19acf8 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
@@ -28,6 +28,7 @@ import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.arg.*;
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 79eb4ff6c2..41b7c60360 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
@@ -25,6 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.guard.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
index cb38649586..ae16f7811d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestDestroy @RestDestroy}
annotation.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
index 79e679abc2..2621a3fc31 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestEndCall @RestEndCall}
annotation.
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 dbfde58a71..57edb8221c 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
@@ -25,6 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
index de815d5ba7..873a49790e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestInit @RestInit} annotation.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
index db81d78959..997c0f5d61 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestInject RestInject}
annotation.
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 92f54dc5ed..bdbdf2a8f2 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
@@ -28,6 +28,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
index c8b97b191d..e3ce2d673f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
@@ -25,6 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
index 8ac43ce929..0dba17aef0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
@@ -25,6 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
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 3acfccb1a7..99fa8e714c 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
@@ -25,6 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
index 590c29b869..2af4e9fcb3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestPostCall @RestPostCall}
annotation.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
index 3edca7210b..b2013cea6d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestPostInit @RestPostInit}
annotation.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
index b72f94e4e3..792c36ce0e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestPreCall @RestPreCall}
annotation.
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 f8a8f04251..aa7ad0fff0 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
@@ -25,6 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
+import org.apache.juneau.common.annotation.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
index 224f59e61a..8833da9e80 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.annotation.*;
/**
* Utility classes and methods for the {@link RestStartCall @RestStartCall}
annotation.
