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 2d9f4979b9 org.apache.juneau.common.reflect API improvements
2d9f4979b9 is described below
commit 2d9f4979b999f04ab70e6fd810ba6c7fa9e01f38
Author: James Bognar <[email protected]>
AuthorDate: Mon Nov 24 08:13:45 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java | 7 +++----
.../src/main/java/org/apache/juneau/BeanSession.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/BeanAnnotation.java | 6 +++---
.../java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java | 6 +++---
.../main/java/org/apache/juneau/annotation/BeancAnnotation.java | 6 +++---
.../main/java/org/apache/juneau/annotation/BeanpAnnotation.java | 6 +++---
.../main/java/org/apache/juneau/annotation/ExampleAnnotation.java | 6 +++---
.../java/org/apache/juneau/annotation/MarshalledAnnotation.java | 6 +++---
.../java/org/apache/juneau/annotation/NamePropertyAnnotation.java | 6 +++---
.../org/apache/juneau/annotation/ParentPropertyAnnotation.java | 6 +++---
.../main/java/org/apache/juneau/annotation/SchemaAnnotation.java | 6 +++---
.../src/main/java/org/apache/juneau/annotation/SwapAnnotation.java | 6 +++---
.../src/main/java/org/apache/juneau/annotation/UriAnnotation.java | 6 +++---
.../src/main/java/org/apache/juneau/cp/BeanStoreEntry.java | 1 -
.../main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java | 7 +++----
.../java/org/apache/juneau/html/annotation/HtmlAnnotation.java | 7 +++----
.../java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java | 7 +++----
.../java/org/apache/juneau/http/annotation/ContentAnnotation.java | 6 +++---
.../java/org/apache/juneau/http/annotation/FormDataAnnotation.java | 6 +++---
.../java/org/apache/juneau/http/annotation/HeaderAnnotation.java | 6 +++---
.../java/org/apache/juneau/http/annotation/PathAnnotation.java | 6 +++---
.../org/apache/juneau/http/annotation/PathRemainderAnnotation.java | 6 +++---
.../java/org/apache/juneau/http/annotation/QueryAnnotation.java | 6 +++---
.../java/org/apache/juneau/http/annotation/RequestAnnotation.java | 7 +++----
.../java/org/apache/juneau/http/annotation/ResponseAnnotation.java | 6 +++---
.../org/apache/juneau/http/annotation/StatusCodeAnnotation.java | 7 +++----
.../main/java/org/apache/juneau/json/JsonSerializerSession.java | 1 -
.../java/org/apache/juneau/json/annotation/JsonAnnotation.java | 7 +++----
.../org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java | 1 -
.../java/org/apache/juneau/msgpack/MsgPackSerializerSession.java | 1 -
.../org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java | 7 +++----
.../main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java | 2 --
.../java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java | 7 +++----
.../src/main/java/org/apache/juneau/parser/ParserSet.java | 1 -
.../apache/juneau/plaintext/annotation/PlainTextAnnotation.java | 7 +++----
.../src/main/java/org/apache/juneau/reflect/Mutaters.java | 1 -
.../src/main/java/org/apache/juneau/serializer/SerializerSet.java | 1 -
.../java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java | 7 +++----
.../main/java/org/apache/juneau/uon/annotation/UonAnnotation.java | 7 +++----
.../juneau/urlencoding/annotation/UrlEncodingAnnotation.java | 7 +++----
.../main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java | 7 +++----
.../java/org/apache/juneau/rest/annotation/RestAnnotation.java | 1 -
.../org/apache/juneau/rest/annotation/RestDeleteAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestDestroyAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestEndCallAnnotation.java | 7 +++----
.../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java | 7 +++----
.../java/org/apache/juneau/rest/annotation/RestInitAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestInjectAnnotation.java | 7 +++----
.../java/org/apache/juneau/rest/annotation/RestOpAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestOptionsAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestPatchAnnotation.java | 7 +++----
.../java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestPostCallAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestPostInitAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestPreCallAnnotation.java | 7 +++----
.../java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 7 +++----
.../org/apache/juneau/rest/annotation/RestStartCallAnnotation.java | 7 +++----
.../main/java/org/apache/juneau/rest/converter/Introspectable.java | 2 --
.../main/java/org/apache/juneau/rest/converter/Traversable.java | 2 --
.../main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java | 1 -
.../main/java/org/apache/juneau/rest/widget/MenuItemWidget.java | 1 -
.../test/java/org/apache/juneau/utils/StringVarResolver_Test.java | 1 -
63 files changed, 142 insertions(+), 189 deletions(-)
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 63625363ad..614fd9a9ea 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
@@ -24,7 +24,6 @@ import java.lang.annotation.*;
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.*;
@@ -92,7 +91,7 @@ public class RdfAnnotation {
* @return A new {@link Rdf @Rdf} object.
*/
public Rdf build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -205,13 +204,13 @@ public class RdfAnnotation {
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Rdf {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Rdf {
private final boolean beanUri;
private final RdfCollectionFormat collectionFormat;
private final String namespace, prefix;
- Impl(RdfAnnotation.Builder b) {
+ Object(RdfAnnotation.Builder b) {
super(b);
this.beanUri = b.beanUri;
this.collectionFormat = b.collectionFormat;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index ad9f5da3a4..1218f6ee22 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -39,7 +39,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.reflect.*;
import org.apache.juneau.common.utils.*;
-import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 544ff1e699..c7ceba9c11 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -603,7 +603,7 @@ public class ClassMeta<T> implements Type {
* Don't call init() in constructor.
* Used for delayed initialization when the possibility of class
reference loops exist.
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings("unchecked")
ClassMeta(Class<T> innerClass, BeanContext beanContext,
ObjectSwap<T,?>[] swaps, ObjectSwap<?,?>[] childSwaps) {
this.innerClass = innerClass;
this.info = info(innerClass);
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 4d810037a0..8ff0db6cc9 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
@@ -104,7 +104,7 @@ public class BeanAnnotation {
* @return A new {@link Bean @Bean} object.
*/
public Bean build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -318,7 +318,7 @@ public class BeanAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Bean {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Bean {
private final boolean findFluentSetters, sort;
private final Class<? extends BeanInterceptor<?>> interceptor;
@@ -327,7 +327,7 @@ public class BeanAnnotation {
private final Class<?>[] dictionary;
private final String example, excludeProperties, p, properties,
readOnlyProperties, ro, typeName, typePropertyName, wo, writeOnlyProperties, xp;
- Impl(BeanAnnotation.Builder b) {
+ Object(BeanAnnotation.Builder b) {
super(b);
this.dictionary = copyOf(b.dictionary);
this.example = b.example;
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 eeda715c9e..8573696f9e 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
@@ -94,14 +94,14 @@ public class BeanIgnoreAnnotation {
* @return A new {@link BeanIgnore @BeanIgnore} object.
*/
public BeanIgnore build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements BeanIgnore {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements BeanIgnore {
- Impl(BeanIgnoreAnnotation.Builder b) {
+ Object(BeanIgnoreAnnotation.Builder b) {
super(b);
postConstruct();
}
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 237d8daef9..d0cfaff615 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
@@ -96,7 +96,7 @@ public class BeancAnnotation {
* @return A new {@link Beanc @Beanc} object.
*/
public Beanc build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -112,11 +112,11 @@ public class BeancAnnotation {
}
- private static class Impl extends AppliedAnnotationObject implements
Beanc {
+ private static class Object extends AppliedAnnotationObject implements
Beanc {
private String properties = "";
- Impl(BeancAnnotation.Builder b) {
+ Object(BeancAnnotation.Builder b) {
super(b);
this.properties = b.properties;
postConstruct();
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 b6988f923e..f78e24c8ca 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
@@ -98,7 +98,7 @@ public class BeanpAnnotation {
* @return A new {@link Beanp @Beanp} object.
*/
public Beanp build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -202,13 +202,13 @@ public class BeanpAnnotation {
}
- private static class Impl extends AppliedAnnotationObject implements
Beanp {
+ private static class Object extends AppliedAnnotationObject implements
Beanp {
private final Class<?> type;
private final Class<?>[] params, dictionary;
private final String name, value, properties, format, ro, wo;
- Impl(BeanpAnnotation.Builder b) {
+ Object(BeanpAnnotation.Builder b) {
super(b);
this.dictionary = copyOf(b.dictionary);
this.format = b.format;
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 07f2ec02f0..4ad4a226be 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
@@ -96,7 +96,7 @@ public class ExampleAnnotation {
* @return A new {@link Example @Example} object.
*/
public Example build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -112,11 +112,11 @@ public class ExampleAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Example {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Example {
private final String value;
- Impl(ExampleAnnotation.Builder b) {
+ Object(ExampleAnnotation.Builder b) {
super(b);
this.value = b.value;
postConstruct();
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 18682acd4d..0b9e553bec 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
@@ -97,7 +97,7 @@ public class MarshalledAnnotation {
* @return A new {@link Marshalled @Marshalled} object.
*/
public Marshalled build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -124,12 +124,12 @@ public class MarshalledAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Marshalled {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Marshalled {
private final Class<?> implClass;
private final String example;
- Impl(MarshalledAnnotation.Builder b) {
+ Object(MarshalledAnnotation.Builder b) {
super(b);
this.example = b.example;
this.implClass = b.implClass;
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 53b2abdf45..fcc05179ce 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
@@ -94,14 +94,14 @@ public class NamePropertyAnnotation {
* @return A new {@link NameProperty @NameProperty} object.
*/
public NameProperty build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
NameProperty {
+ private static class Object extends AppliedAnnotationObject implements
NameProperty {
- Impl(NamePropertyAnnotation.Builder b) {
+ Object(NamePropertyAnnotation.Builder b) {
super(b);
postConstruct();
}
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 f47e9e8068..e12c436b0c 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
@@ -94,14 +94,14 @@ public class ParentPropertyAnnotation {
* @return A new {@link ParentProperty @ParentProperty} object.
*/
public ParentProperty build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
ParentProperty {
+ private static class Object extends AppliedAnnotationObject implements
ParentProperty {
- Impl(ParentPropertyAnnotation.Builder b) {
+ Object(ParentPropertyAnnotation.Builder b) {
super(b);
postConstruct();
}
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 945a4ded04..7a4eb4f852 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
@@ -267,7 +267,7 @@ public class SchemaAnnotation {
* @return A new {@link Schema @Schema} object.
*/
public Schema build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -925,7 +925,7 @@ public class SchemaAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Schema {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Schema {
private final boolean aev, allowEmptyValue, exclusiveMaximum,
emax, exclusiveMinimum, emin, uniqueItems, ui, required, r, readOnly, ro, sie,
skipIfEmpty, ignore;
private final ExternalDocs externalDocs;
@@ -938,7 +938,7 @@ public class SchemaAnnotation {
private final String $id, contentMediaType, contentEncoding,
exclusiveMaximumValue, exclusiveMinimumValue;
private final String[] _const, examples, $comment, prefixItems,
unevaluatedItems, unevaluatedProperties, dependentSchemas, dependentRequired,
_if, _then, _else, $defs;
- Impl(SchemaAnnotation.Builder b) {
+ Object(SchemaAnnotation.Builder b) {
super(b);
this.$ref = b.$ref;
this._default = copyOf(b._default);
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 969fb555c5..3c9371015a 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
@@ -99,7 +99,7 @@ public class SwapAnnotation {
* @return A new {@link Swap @Swap} object.
*/
public Swap build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -148,13 +148,13 @@ public class SwapAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Swap {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Swap {
private final Class<?> impl, value;
private final String template;
private final String[] mediaTypes;
- Impl(SwapAnnotation.Builder b) {
+ Object(SwapAnnotation.Builder b) {
super(b);
this.impl = b.impl;
this.mediaTypes = copyOf(b.mediaTypes);
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 0ae5949b15..3e85c94e34 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
@@ -94,14 +94,14 @@ public class UriAnnotation {
* @return A new {@link Uri @Uri} object.
*/
public Uri build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Uri {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Uri {
- Impl(UriAnnotation.Builder b) {
+ Object(UriAnnotation.Builder b) {
super(b);
postConstruct();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
index eafb3c339b..693b87b93d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
@@ -24,7 +24,6 @@ import static org.apache.juneau.common.utils.Utils.*;
import java.util.function.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.common.utils.*;
/**
* Represents a bean in a {@link BeanStore}.
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 9cc0b905c3..979d1547c3 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -95,14 +94,14 @@ public class CsvAnnotation {
* @return A new {@link Csv @Csv} object.
*/
public Csv build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Csv {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Csv {
- Impl(CsvAnnotation.Builder b) {
+ Object(CsvAnnotation.Builder b) {
super(b);
postConstruct();
}
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 0083160dfd..5698a6d619 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -116,7 +115,7 @@ public class HtmlAnnotation {
* @return A new {@link Html @Html} object.
*/
public Html build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -187,14 +186,14 @@ public class HtmlAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Html {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Html {
private boolean noTableHeaders, noTables;
private Class<? extends HtmlRender> render;
private final String anchorText, link, style;
private HtmlFormat format;
- Impl(HtmlAnnotation.Builder b) {
+ Object(HtmlAnnotation.Builder b) {
super(b);
this.anchorText = b.anchorText;
this.format = b.format;
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 92bb36b3f8..dc7c2877b3 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -100,7 +99,7 @@ public class HtmlLinkAnnotation {
* @return A new {@link HtmlLink @HtmlLink} object.
*/
public HtmlLink build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -127,11 +126,11 @@ public class HtmlLinkAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements HtmlLink {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements HtmlLink {
private final String nameProperty, uriProperty;
- Impl(HtmlLinkAnnotation.Builder b) {
+ Object(HtmlLinkAnnotation.Builder b) {
super(b);
this.nameProperty = b.nameProperty;
this.uriProperty = b.uriProperty;
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 b57db41c8c..f079710f0d 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
@@ -99,7 +99,7 @@ public class ContentAnnotation {
* @return A new {@link Content @Content} object.
*/
public Content build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -138,13 +138,13 @@ public class ContentAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Content {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Content {
private final String def;
private final String[] description;
private final Schema schema;
- Impl(ContentAnnotation.Builder b) {
+ Object(ContentAnnotation.Builder b) {
super(b);
this.def = b.def;
this.description = b.description;
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 c649e44086..9168b5fa66 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
@@ -107,7 +107,7 @@ public class FormDataAnnotation {
* @return A new {@link FormData @FormData} object.
*/
public FormData build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -178,14 +178,14 @@ public class FormDataAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements FormData {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements FormData {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
private final String name, value, def;
private final Schema schema;
- Impl(FormDataAnnotation.Builder b) {
+ Object(FormDataAnnotation.Builder b) {
super(b);
this.def = b.def;
this.name = b.name;
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 46592cc2c2..d3cd0546ad 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
@@ -107,7 +107,7 @@ public class HeaderAnnotation {
* @return A new {@link Header @Header} object.
*/
public Header build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -178,14 +178,14 @@ public class HeaderAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Header {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Header {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
private final String name, value, def;
private final Schema schema;
- Impl(HeaderAnnotation.Builder b) {
+ Object(HeaderAnnotation.Builder b) {
super(b);
this.def = b.def;
this.name = b.name;
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 161f42594d..6244e505c2 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
@@ -108,7 +108,7 @@ public class PathAnnotation {
* @return A new {@link Path @Path} object.
*/
public Path build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -179,14 +179,14 @@ public class PathAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Path {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Path {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
private final String name, value, def;
private final Schema schema;
- Impl(PathAnnotation.Builder b) {
+ Object(PathAnnotation.Builder b) {
super(b);
this.def = b.def;
this.name = b.name;
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 df4d8a54ae..0dfa5c908e 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
@@ -113,7 +113,7 @@ public class PathRemainderAnnotation {
* @return A new {@link PathRemainder @PathRemainder} object.
*/
public PathRemainder build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -173,7 +173,7 @@ public class PathRemainderAnnotation {
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements PathRemainder {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements PathRemainder {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
@@ -181,7 +181,7 @@ public class PathRemainderAnnotation {
private final String[] description;
private final Schema schema;
- Impl(PathRemainderAnnotation.Builder b) {
+ Object(PathRemainderAnnotation.Builder b) {
super(b);
this.def = b.def;
this.description = copyOf(b.description);
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 24972f0068..4dd93f6d89 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
@@ -107,7 +107,7 @@ public class QueryAnnotation {
* @return A new {@link Query @Query} object.
*/
public Query build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -178,14 +178,14 @@ public class QueryAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Query {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Query {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
private final String name, value, def;
private final Schema schema;
- Impl(QueryAnnotation.Builder b) {
+ Object(QueryAnnotation.Builder b) {
super(b);
this.name = b.name;
this.parser = b.parser;
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 2c5b8015a1..84013f200d 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -99,7 +98,7 @@ public class RequestAnnotation {
* @return A new {@link Request @Request} object.
*/
public Request build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -126,12 +125,12 @@ public class RequestAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Request {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Request {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
- Impl(RequestAnnotation.Builder b) {
+ Object(RequestAnnotation.Builder b) {
super(b);
this.parser = b.parser;
this.serializer = b.serializer;
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 6aa375df7a..63f707012a 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
@@ -102,7 +102,7 @@ public class ResponseAnnotation {
* @return A new {@link Response @Response} object.
*/
public Response build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -162,7 +162,7 @@ public class ResponseAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Response {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Response {
private final Class<? extends HttpPartParser> parser;
private final Class<? extends HttpPartSerializer> serializer;
@@ -170,7 +170,7 @@ public class ResponseAnnotation {
private final Schema schema;
private final String[] examples;
- Impl(ResponseAnnotation.Builder b) {
+ Object(ResponseAnnotation.Builder b) {
super(b);
this.examples = copyOf(b.examples);
this.headers = copyOf(b.headers);
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 22965be7db..c5f396cf9e 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
@@ -24,7 +24,6 @@ import java.lang.annotation.*;
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.*;
@@ -98,7 +97,7 @@ public class StatusCodeAnnotation {
* @return A new {@link StatusCode @StatusCode} object.
*/
public StatusCode build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -114,11 +113,11 @@ public class StatusCodeAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements StatusCode {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements StatusCode {
private final int[] value;
- Impl(StatusCodeAnnotation.Builder b) {
+ Object(StatusCodeAnnotation.Builder b) {
super(b);
this.value = Arrays.copyOf(b.value, b.value.length);
postConstruct();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index d58bbd5085..7b213e7ab8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -30,7 +30,6 @@ import org.apache.juneau.common.collections.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
-import org.apache.juneau.swap.*;
/**
* Session object that lives for the duration of a single use of {@link
JsonSerializer}.
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 5b6e367d4a..2437833cff 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -100,7 +99,7 @@ public class JsonAnnotation {
* @return A new {@link Json @Json} object.
*/
public Json build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -116,11 +115,11 @@ public class JsonAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Json {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Json {
private final String wrapperAttr;
- Impl(JsonAnnotation.Builder b) {
+ Object(JsonAnnotation.Builder b) {
super(b);
this.wrapperAttr = b.wrapperAttr;
postConstruct();
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 2bfe75d337..e25d7f010c 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
@@ -32,7 +32,6 @@ import org.apache.juneau.common.utils.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.swap.*;
/**
* Session object that lives for the duration of a single use of {@link
JsonSchemaSerializer}.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index a17c339845..de9bc41845 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -29,7 +29,6 @@ import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
-import org.apache.juneau.swap.*;
/**
* Session object that lives for the duration of a single use of {@link
MsgPackSerializer}.
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 4c012fa896..49beb34f4d 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -98,14 +97,14 @@ public class MsgPackAnnotation {
* @return A new {@link MsgPack @MsgPack} object.
*/
public MsgPack build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements MsgPack {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements MsgPack {
- Impl(MsgPackAnnotation.Builder b) {
+ Object(MsgPackAnnotation.Builder b) {
super(b);
postConstruct();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index f2fc3b6712..ac1492da59 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -35,7 +35,6 @@ import org.apache.juneau.common.utils.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
-import org.apache.juneau.swap.*;
import org.apache.juneau.swaps.*;
import org.apache.juneau.uon.*;
@@ -290,7 +289,6 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
ctx = builder.ctx;
}
- @SuppressWarnings("rawtypes")
@Override /* Overridden from PartSerializer */
public String serialize(HttpPartType partType, HttpPartSchema schema,
Object value) throws SerializeException, SchemaValidationException {
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 9889c8b1c7..8b31cff164 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -98,14 +97,14 @@ public class OpenApiAnnotation {
* @return A new {@link OpenApi @OpenApi} object.
*/
public OpenApi build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements OpenApi {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements OpenApi {
- Impl(OpenApiAnnotation.Builder b) {
+ Object(OpenApiAnnotation.Builder b) {
super(b);
postConstruct();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 76ae5f1e87..79ffaa00ee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -29,7 +29,6 @@ import java.util.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.common.reflect.*;
/**
* Represents a group of {@link Parser Parsers} that can be looked up by media
type.
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 e3759cf13f..6652d9f004 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -95,14 +94,14 @@ public class PlainTextAnnotation {
* @return A new {@link PlainText @PlainText} object.
*/
public PlainText build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements PlainText {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements PlainText {
- Impl(PlainTextAnnotation.Builder b) {
+ Object(PlainTextAnnotation.Builder b) {
super(b);
postConstruct();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
index 328a67828e..6a4875c2d9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
@@ -21,7 +21,6 @@ import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
-import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index c06458c07c..1a6cc1805b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -29,7 +29,6 @@ import java.util.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.common.reflect.*;
/**
* Represents a group of {@link Serializer Serializers} that can be looked up
by media type.
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 f0b92029c2..5413a03c3a 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -95,14 +94,14 @@ public class SoapXmlAnnotation {
* @return A new {@link SoapXml @SoapXml} object.
*/
public SoapXml build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements SoapXml {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements SoapXml {
- Impl(SoapXmlAnnotation.Builder b) {
+ Object(SoapXmlAnnotation.Builder b) {
super(b);
postConstruct();
}
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 6768be5743..55da6c3476 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -98,14 +97,14 @@ public class UonAnnotation {
* @return A new {@link Uon @Uon} object.
*/
public Uon build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Uon {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Uon {
- Impl(UonAnnotation.Builder b) {
+ Object(UonAnnotation.Builder b) {
super(b);
postConstruct();
}
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 3f29ca4346..5d99d535d7 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -100,7 +99,7 @@ public class UrlEncodingAnnotation {
* @return A new {@link UrlEncoding @UrlEncoding} object.
*/
public UrlEncoding build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -116,11 +115,11 @@ public class UrlEncodingAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements UrlEncoding {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements UrlEncoding {
private final boolean expandedParams;
- Impl(UrlEncodingAnnotation.Builder b) {
+ Object(UrlEncodingAnnotation.Builder b) {
super(b);
this.expandedParams = b.expandedParams;
postConstruct();
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 700cea2ebc..12da36e978 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
@@ -23,7 +23,6 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
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.*;
@@ -101,7 +100,7 @@ public class XmlAnnotation {
* @return A new {@link Xml @Xml} object.
*/
public Xml build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -150,12 +149,12 @@ public class XmlAnnotation {
}
- private static class Impl extends AppliedOnTypeAnnotationObject
implements Xml {
+ private static class Object extends AppliedOnTypeAnnotationObject
implements Xml {
private final String childName, namespace, prefix;
private final XmlFormat format;
- Impl(XmlAnnotation.Builder b) {
+ Object(XmlAnnotation.Builder b) {
super(b);
this.childName = b.childName;
this.format = b.format;
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 e2896f8586..cf50daf8f8 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
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 e2b787c174..db44434579 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
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.*;
@@ -71,7 +70,7 @@ public class RestDeleteAnnotation {
* @return A new {@link RestDelete @RestDelete} object.
*/
public RestDelete build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -304,7 +303,7 @@ public class RestDeleteAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestDelete {
+ private static class Object extends AppliedAnnotationObject implements
RestDelete {
private final Class<? extends RestGuard>[] guards;
private final Class<? extends RestMatcher>[] matchers;
@@ -313,7 +312,7 @@ public class RestDeleteAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
private final String[] defaultRequestQueryData,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders, path;
- Impl(RestDeleteAnnotation.Builder b) {
+ Object(RestDeleteAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.debug = b.debug;
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 5650848d91..08d6e61890 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,14 +70,14 @@ public class RestDestroyAnnotation {
* @return A new {@link RestDestroy @RestDestroy} object.
*/
public RestDestroy build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestDestroy {
+ private static class Object extends AppliedAnnotationObject implements
RestDestroy {
- Impl(RestDestroyAnnotation.Builder b) {
+ Object(RestDestroyAnnotation.Builder b) {
super(b);
postConstruct();
}
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 ff0390e7fc..9ee9279774 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,14 +70,14 @@ public class RestEndCallAnnotation {
* @return A new {@link RestEndCall @RestEndCall} object.
*/
public RestEndCall build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestEndCall {
+ private static class Object extends AppliedAnnotationObject implements
RestEndCall {
- Impl(RestEndCallAnnotation.Builder b) {
+ Object(RestEndCallAnnotation.Builder b) {
super(b);
postConstruct();
}
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 20e3f1ce6e..e3fdbe102c 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
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.*;
@@ -75,7 +74,7 @@ public class RestGetAnnotation {
* @return A new {@link RestGet @RestGet} object.
*/
public RestGet build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -346,7 +345,7 @@ public class RestGetAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestGet {
+ private static class Object extends AppliedAnnotationObject implements
RestGet {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
@@ -357,7 +356,7 @@ public class RestGetAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
private final String[] defaultRequestQueryData,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders, path,
produces;
- Impl(RestGetAnnotation.Builder b) {
+ Object(RestGetAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.converters = copyOf(b.converters);
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 41c539188c..3b59db4c1e 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,14 +70,14 @@ public class RestInitAnnotation {
* @return A new {@link RestInit @RestInit} object.
*/
public RestInit build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestInit {
+ private static class Object extends AppliedAnnotationObject implements
RestInit {
- Impl(RestInitAnnotation.Builder b) {
+ Object(RestInitAnnotation.Builder b) {
super(b);
postConstruct();
}
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 0e2f456e2c..85c8564d17 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,7 +70,7 @@ public class RestInjectAnnotation {
* @return A new {@link RestInject @RestInject} object.
*/
public RestInject build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -109,12 +108,12 @@ public class RestInjectAnnotation {
}
- private static class Impl extends AppliedAnnotationObject implements
RestInject {
+ private static class Object extends AppliedAnnotationObject implements
RestInject {
private final String name, value;
private final String[] methodScope;
- Impl(RestInjectAnnotation.Builder b) {
+ Object(RestInjectAnnotation.Builder b) {
super(b);
this.name = b.name;
this.value = b.value;
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 3bc6bf26d0..9ca72168bd 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
@@ -25,7 +25,6 @@ import java.nio.charset.*;
import java.util.function.*;
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.*;
@@ -81,7 +80,7 @@ public class RestOpAnnotation {
* @return A new {@link RestOp @RestOp} object.
*/
public RestOp build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -433,7 +432,7 @@ public class RestOpAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestOp {
+ private static class Object extends AppliedAnnotationObject implements
RestOp {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
@@ -445,7 +444,7 @@ public class RestOpAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, method, rolesDeclared, roleGuard,
summary, value;
private final String[] consumes, defaultRequestFormData,
defaultRequestQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, path, produces;
- Impl(RestOpAnnotation.Builder b) {
+ Object(RestOpAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.consumes = copyOf(b.consumes);
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 b446fbc0c4..1c890364cf 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
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.*;
@@ -75,7 +74,7 @@ public class RestOptionsAnnotation {
* @return A new {@link RestOptions @RestOptions} object.
*/
public RestOptions build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -346,7 +345,7 @@ public class RestOptionsAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestOptions {
+ private static class Object extends AppliedAnnotationObject implements
RestOptions {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
@@ -357,7 +356,7 @@ public class RestOptionsAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
private final String[] defaultRequestQueryData,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders, path,
produces;
- Impl(RestOptionsAnnotation.Builder b) {
+ Object(RestOptionsAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.converters = copyOf(b.converters);
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 1ceafbbf14..83cdc30016 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
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.*;
@@ -77,7 +76,7 @@ public class RestPatchAnnotation {
* @return A new {@link RestPatch @RestPatch} object.
*/
public RestPatch build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -408,7 +407,7 @@ public class RestPatchAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestPatch {
+ private static class Object extends AppliedAnnotationObject implements
RestPatch {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
@@ -420,7 +419,7 @@ public class RestPatchAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
private final String[] consumes, defaultRequestFormData,
defaultRequestQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, path, produces;
- Impl(RestPatchAnnotation.Builder b) {
+ Object(RestPatchAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.consumes = copyOf(b.consumes);
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 1ca6fb2ff4..f68391de8d 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
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.*;
@@ -77,7 +76,7 @@ public class RestPostAnnotation {
* @return A new {@link RestPost @RestPost} object.
*/
public RestPost build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -408,7 +407,7 @@ public class RestPostAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestPost {
+ private static class Object extends AppliedAnnotationObject implements
RestPost {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
@@ -420,7 +419,7 @@ public class RestPostAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
private final String[] consumes, defaultRequestFormData,
defaultRequestQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, path, produces;
- Impl(RestPostAnnotation.Builder b) {
+ Object(RestPostAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.consumes = copyOf(b.consumes);
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 99653d069a..cf8b6f3b3e 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,14 +70,14 @@ public class RestPostCallAnnotation {
* @return A new {@link RestPostCall @RestPostCall} object.
*/
public RestPostCall build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestPostCall {
+ private static class Object extends AppliedAnnotationObject implements
RestPostCall {
- Impl(RestPostCallAnnotation.Builder b) {
+ Object(RestPostCallAnnotation.Builder b) {
super(b);
postConstruct();
}
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 d3f4888ef7..ce4f6fd597 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -73,7 +72,7 @@ public class RestPostInitAnnotation {
* @return A new {@link RestPostInit @RestPostInit} object.
*/
public RestPostInit build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -88,11 +87,11 @@ public class RestPostInitAnnotation {
}
- private static class Impl extends AppliedAnnotationObject implements
RestPostInit {
+ private static class Object extends AppliedAnnotationObject implements
RestPostInit {
private final boolean childFirst;
- Impl(RestPostInitAnnotation.Builder b) {
+ Object(RestPostInitAnnotation.Builder b) {
super(b);
this.childFirst = b.childFirst;
postConstruct();
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 d4c6752297..6d02a44bcd 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,14 +70,14 @@ public class RestPreCallAnnotation {
* @return A new {@link RestPreCall @RestPreCall} object.
*/
public RestPreCall build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestPreCall {
+ private static class Object extends AppliedAnnotationObject implements
RestPreCall {
- Impl(RestPreCallAnnotation.Builder b) {
+ Object(RestPreCallAnnotation.Builder b) {
super(b);
postConstruct();
}
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 cfdbe89a69..a0668cc3f9 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
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
import java.nio.charset.*;
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.*;
@@ -77,7 +76,7 @@ public class RestPutAnnotation {
* @return A new {@link RestPut @RestPut} object.
*/
public RestPut build() {
- return new Impl(this);
+ return new Object(this);
}
/**
@@ -408,7 +407,7 @@ public class RestPutAnnotation {
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestPut {
+ private static class Object extends AppliedAnnotationObject implements
RestPut {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
@@ -420,7 +419,7 @@ public class RestPutAnnotation {
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
private final String[] consumes, defaultRequestFormData,
defaultRequestQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, path, produces;
- Impl(RestPutAnnotation.Builder b) {
+ Object(RestPutAnnotation.Builder b) {
super(b);
this.clientVersion = b.clientVersion;
this.consumes = copyOf(b.consumes);
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 61ab4e7b6e..7b994478a5 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
@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.common.annotation.*;
/**
@@ -71,14 +70,14 @@ public class RestStartCallAnnotation {
* @return A new {@link RestStartCall @RestStartCall} object.
*/
public RestStartCall build() {
- return new Impl(this);
+ return new Object(this);
}
}
- private static class Impl extends AppliedAnnotationObject implements
RestStartCall {
+ private static class Object extends AppliedAnnotationObject implements
RestStartCall {
- Impl(RestStartCallAnnotation.Builder b) {
+ Object(RestStartCallAnnotation.Builder b) {
super(b);
postConstruct();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Introspectable.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Introspectable.java
index b9cca5f6d6..9f4f90f994 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Introspectable.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Introspectable.java
@@ -24,7 +24,6 @@ import org.apache.juneau.http.response.*;
import org.apache.juneau.json.*;
import org.apache.juneau.objecttools.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.swap.*;
/**
* Converter for enablement of {@link ObjectIntrospector} support on response
objects returned by a
@@ -65,7 +64,6 @@ public class Introspectable implements RestConverter {
""";
@Override /* Overridden from RestConverter */
- @SuppressWarnings({ "unchecked", "rawtypes" })
public Object convert(RestRequest req, Object o) throws
InternalServerError {
String method = req.getQueryParam("invokeMethod").orElse(null);
String args = req.getQueryParam("invokeArgs").orElse(null);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Traversable.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Traversable.java
index 2dd41ad48d..bad435ad1d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Traversable.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Traversable.java
@@ -23,7 +23,6 @@ import org.apache.juneau.http.response.*;
import org.apache.juneau.objecttools.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.swap.*;
/**
* Converter for enabling of {@link ObjectRest} support on response objects
returned by a <c>@RestOp</c>-annotated method.
@@ -49,7 +48,6 @@ import org.apache.juneau.swap.*;
public class Traversable implements RestConverter {
@Override /* Overridden from RestConverter */
- @SuppressWarnings({ "rawtypes", "unchecked" })
public Object convert(RestRequest req, Object o) throws
BasicHttpException, InternalServerError {
if (o == null)
return null;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
index 9cc36aad68..c2dff34b8e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHttpPart.java
@@ -33,7 +33,6 @@ import org.apache.juneau.http.response.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.parser.ParseException;
-import org.apache.juneau.common.reflect.*;
import org.apache.juneau.rest.*;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
index ae75d2a81d..65be3ef8cc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
@@ -26,7 +26,6 @@ import java.io.*;
import org.apache.juneau.common.io.*;
import org.apache.juneau.html.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.serializer.*;
/**
* A subclass of widgets for rendering menu items with drop-down windows.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
index b9ee0e7d3a..45d68a3f4b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
@@ -18,7 +18,6 @@ package org.apache.juneau.utils;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
-import static org.apache.juneau.common.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
