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 9d359a3024 org.apache.juneau.common.reflect API improvements
9d359a3024 is described below
commit 9d359a3024cf75af4ea74b481e59e52462006f43
Author: James Bognar <[email protected]>
AuthorDate: Mon Nov 24 07:41:13 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../annotation/{AnnotationImpl.java => AnnotationObject.java} | 8 ++++----
.../java/org/apache/juneau/annotation/ExternalDocsAnnotation.java | 4 ++--
.../main/java/org/apache/juneau/annotation/ItemsAnnotation.java | 4 ++--
.../java/org/apache/juneau/annotation/SubItemsAnnotation.java | 4 ++--
.../org/apache/juneau/annotation/TargetedAnnotationBuilder.java | 2 +-
.../java/org/apache/juneau/annotation/TargetedAnnotationImpl.java | 2 +-
.../java/org/apache/juneau/http/annotation/ContactAnnotation.java | 4 ++--
.../org/apache/juneau/http/annotation/HasFormDataAnnotation.java | 4 ++--
.../org/apache/juneau/http/annotation/HasQueryAnnotation.java | 4 ++--
.../java/org/apache/juneau/http/annotation/LicenseAnnotation.java | 4 ++--
.../java/org/apache/juneau/http/annotation/TagAnnotation.java | 4 ++--
.../org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java | 4 ++--
.../java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java | 4 ++--
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
similarity index 95%
rename from
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
index eb2e71380c..41aa1b85dc 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationImpl.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
@@ -39,14 +39,14 @@ import org.apache.juneau.common.utils.*;
* Constructors must call the {@link #postConstruct()} method after all fields
have been set to trigger this calculation.
*
*/
-public class AnnotationImpl implements Annotation {
+public class AnnotationObject implements Annotation {
//-----------------------------------------------------------------------------------------------------------------
// Static
//-----------------------------------------------------------------------------------------------------------------
/**
- * Builder for {@link AnnotationImpl} objects.
+ * Builder for {@link AnnotationObject} objects.
*
* @param <B> The actual builder class.
*/
@@ -65,7 +65,7 @@ public class AnnotationImpl implements Annotation {
}
/**
- * Sets the {@link AnnotationImpl#description()} property on
the target annotation.
+ * Sets the {@link AnnotationObject#description()} property on
the target annotation.
*
* @param value The new value for this property.
* @return This object.
@@ -115,7 +115,7 @@ public class AnnotationImpl implements Annotation {
*
* @param b The builder used to instantiate the fields of this class.
*/
- public AnnotationImpl(Builder<?> b) {
+ public AnnotationObject(Builder<?> b) {
this.annotationType = b.getAnnotationType();
this.description = copyOf(b.getDescription());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
index 72af7e4882..72cf314473 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
@@ -38,7 +38,7 @@ public class ExternalDocsAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
String url = "";
@@ -71,7 +71,7 @@ public class ExternalDocsAnnotation {
}
- private static class Impl extends AnnotationImpl implements
ExternalDocs {
+ private static class Impl extends AnnotationObject implements
ExternalDocs {
private final String url;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
index 0ae274d7ed..d5b33c5d84 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
@@ -34,7 +34,7 @@ public class ItemsAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
boolean emax, emin, exclusiveMaximum, exclusiveMinimum, ui,
uniqueItems;
long maxItems = -1, maxLength = -1, maxi = -1, maxl = -1,
minItems = -1, minLength = -1, mini = -1, minl = -1;
@@ -434,7 +434,7 @@ public class ItemsAnnotation {
}
- private static class Impl extends AnnotationImpl implements Items {
+ private static class Impl extends AnnotationObject implements Items {
private final boolean emax, emin, exclusiveMaximum,
exclusiveMinimum, ui, uniqueItems;
private final long maxi, maxItems, maxl, maxLength, mini,
minItems, minl, minLength;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
index f529d0a310..dad707eb54 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
@@ -40,7 +40,7 @@ public class SubItemsAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
String $ref = "", cf = "", collectionFormat = "", f = "",
format = "", max = "", maximum = "", min = "", minimum = "", mo = "",
multipleOf = "", p = "", pattern = "", t = "", type = "";
long maxItems = -1, maxLength = -1, maxi = -1, maxl = -1,
minItems = -1, minLength = -1, mini = -1, minl = -1;
@@ -439,7 +439,7 @@ public class SubItemsAnnotation {
}
- private static class Impl extends AnnotationImpl implements SubItems {
+ private static class Impl extends AnnotationObject implements SubItems {
private final boolean emax, emin, exclusiveMaximum,
exclusiveMinimum, ui, uniqueItems;
private final long maxi, maxItems, maxl, maxLength, mini,
minItems, minl, minLength;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
index 7b2be4292a..d4e680d1d2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
@@ -28,7 +28,7 @@ import org.apache.juneau.common.annotation.*;
*
* @param <B> The actual builder class.
*/
-public class TargetedAnnotationBuilder<B> extends AnnotationImpl.Builder<B> {
+public class TargetedAnnotationBuilder<B> extends AnnotationObject.Builder<B> {
String[] on = {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
index 4e211d88d1..25fccaf00a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationImpl.java
@@ -24,7 +24,7 @@ import org.apache.juneau.common.annotation.*;
* An implementation of an annotation that has an <code>on</code> value
targeting classes/methods/fields/constructors.
*
*/
-public class TargetedAnnotationImpl extends AnnotationImpl {
+public class TargetedAnnotationImpl extends AnnotationObject {
private final String[] on;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
index 35e22c817a..22c2660895 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
@@ -32,7 +32,7 @@ public class ContactAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
String email = "", name = "", url = "";
@@ -87,7 +87,7 @@ public class ContactAnnotation {
}
- private static class Impl extends AnnotationImpl implements Contact {
+ private static class Impl extends AnnotationObject implements Contact {
private final String email, name, url;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
index 8c156cd262..2884d18c45 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
@@ -32,7 +32,7 @@ public class HasFormDataAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
String name = "", value = "";
@@ -76,7 +76,7 @@ public class HasFormDataAnnotation {
}
- private static class Impl extends AnnotationImpl implements HasFormData
{
+ private static class Impl extends AnnotationObject implements
HasFormData {
private final String name, value;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
index 237d01b711..6b2613e384 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
@@ -32,7 +32,7 @@ public class HasQueryAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
String name = "", value = "";
@@ -76,7 +76,7 @@ public class HasQueryAnnotation {
}
- private static class Impl extends AnnotationImpl implements HasQuery {
+ private static class Impl extends AnnotationObject implements HasQuery {
private final String name, value;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
index 9bed7b6ecd..98c7a8bd0f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
@@ -32,7 +32,7 @@ public class LicenseAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
String name = "", url = "";
@@ -76,7 +76,7 @@ public class LicenseAnnotation {
}
- private static class Impl extends AnnotationImpl implements License {
+ private static class Impl extends AnnotationObject implements License {
private final String name, url;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
index 7fecb361d3..3a67c532f7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
@@ -33,7 +33,7 @@ public class TagAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
String name = "";
@@ -78,7 +78,7 @@ public class TagAnnotation {
}
- private static class Impl extends AnnotationImpl implements Tag {
+ private static class Impl extends AnnotationObject implements Tag {
private final ExternalDocs externalDocs;
private final String name;
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 c9d7bed340..6f1174329f 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
@@ -38,7 +38,7 @@ public class OpSwaggerAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
String deprecated = "", operationId = "";
@@ -183,7 +183,7 @@ public class OpSwaggerAnnotation {
}
- private static class Impl extends AnnotationImpl implements OpSwagger {
+ private static class Impl extends AnnotationObject implements OpSwagger
{
private final ExternalDocs externalDocs;
private final String deprecated, operationId;
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 cbce21ee70..6fbbc6a082 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
@@ -39,7 +39,7 @@ public class SwaggerAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
- public static class Builder extends AnnotationImpl.Builder<Builder> {
+ public static class Builder extends AnnotationObject.Builder<Builder> {
Contact contact = ContactAnnotation.DEFAULT;
ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
@@ -154,7 +154,7 @@ public class SwaggerAnnotation {
}
- private static class Impl extends AnnotationImpl implements Swagger {
+ private static class Impl extends AnnotationObject implements Swagger {
private final Contact contact;
private final ExternalDocs externalDocs;
