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 0b4fb8f Code cleanup.
0b4fb8f is described below
commit 0b4fb8f415d9f10059d8c7266a763661cd97a3fe
Author: JamesBognar <[email protected]>
AuthorDate: Sat Aug 7 13:47:21 2021 -0400
Code cleanup.
---
.../main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java | 4 ++--
.../org/apache/juneau/jena/annotation/RdfConfigAnnotation.java | 4 ++--
.../src/main/java/org/apache/juneau/ConfigApply.java | 5 ++---
.../src/main/java/org/apache/juneau/annotation/BeanAnnotation.java | 5 ++---
.../java/org/apache/juneau/annotation/BeanConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/annotation/BeancAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/annotation/BeanpAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/annotation/ExampleAnnotation.java | 5 ++---
.../java/org/apache/juneau/annotation/MarshalledAnnotation.java | 5 ++---
.../java/org/apache/juneau/annotation/NamePropertyAnnotation.java | 5 ++---
.../org/apache/juneau/annotation/ParentPropertyAnnotation.java | 5 ++---
.../src/main/java/org/apache/juneau/annotation/SwapAnnotation.java | 5 ++---
.../src/main/java/org/apache/juneau/annotation/UriAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java | 5 ++---
.../java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/html/annotation/HtmlAnnotation.java | 5 ++---
.../org/apache/juneau/html/annotation/HtmlConfigAnnotation.java | 5 ++---
.../org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/BodyAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/FormDataAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/HeaderAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/PathAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/QueryAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/RequestAnnotation.java | 5 ++---
.../java/org/apache/juneau/http/annotation/ResponseAnnotation.java | 5 ++---
.../org/apache/juneau/http/annotation/ResponseBodyAnnotation.java | 5 ++---
.../apache/juneau/http/annotation/ResponseHeaderAnnotation.java | 5 ++---
.../apache/juneau/http/annotation/ResponseStatusAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java | 5 ++---
.../java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/json/annotation/JsonAnnotation.java | 5 ++---
.../org/apache/juneau/json/annotation/JsonConfigAnnotation.java | 5 ++---
.../juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java | 5 ++---
.../org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java | 5 ++---
.../org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java | 5 ++---
.../apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java | 5 ++---
.../org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java | 5 ++---
.../apache/juneau/parser/annotation/ParserConfigAnnotation.java | 5 ++---
.../apache/juneau/plaintext/annotation/PlainTextAnnotation.java | 5 ++---
.../juneau/plaintext/annotation/PlainTextConfigAnnotation.java | 5 ++---
.../src/main/java/org/apache/juneau/reflect/AnnotationInfo.java | 7 +++----
.../juneau/serializer/annotation/SerializerConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java | 5 ++---
.../org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/uon/annotation/UonAnnotation.java | 5 ++---
.../java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java | 5 ++---
.../juneau/urlencoding/annotation/UrlEncodingAnnotation.java | 5 ++---
.../juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java | 5 ++---
.../main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java | 5 ++---
.../java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java | 5 ++---
.../java/org/apache/juneau/rest/annotation/RestAnnotation.java | 5 ++---
.../org/apache/juneau/rest/annotation/RestDeleteAnnotation.java | 5 ++---
.../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java | 5 ++---
.../java/org/apache/juneau/rest/annotation/RestOpAnnotation.java | 5 ++---
.../java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 5 ++---
.../java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 5 ++---
59 files changed, 119 insertions(+), 176 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 df5a40e..5478456 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
@@ -236,8 +236,8 @@ public class RdfAnnotation {
* @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Rdf> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Rdf.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 9dbd0e9..deeeff1 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -36,8 +36,8 @@ public class RdfConfigAnnotation {
* @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<RdfConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(RdfConfig.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
index e6a2444..ef3fc2d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
@@ -222,11 +222,10 @@ public abstract class ConfigApply<T extends Annotation> {
/**
* Constructor.
*
- * @param c The annotation class.
* @param r The string resolver to use for resolving strings.
*/
- public NoOp(Class<Annotation> c, VarResolverSession r) {
- super(c, r);
+ public NoOp(VarResolverSession r) {
+ super(Annotation.class, r);
}
@Override /* ConfigApply */
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 0ca46f8..c4f9dc3 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
@@ -496,11 +496,10 @@ public class BeanAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Bean> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Bean.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
index 4237ef7..a9fc278 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
@@ -35,11 +35,10 @@ public class BeanConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<BeanConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(BeanConfig.class, vr);
}
@Override
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 2090a71..946e806 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
@@ -157,11 +157,10 @@ public class BeanIgnoreAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<BeanIgnore> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(BeanIgnore.class, vr);
}
@Override
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 a50b682..11ce0f7 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
@@ -143,11 +143,10 @@ public class BeancAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Beanc> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Beanc.class, vr);
}
@Override
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 205e901..abd32f6 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
@@ -299,11 +299,10 @@ public class BeanpAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Beanp> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Beanp.class, vr);
}
@Override
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 12a2f90..80fe489 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
@@ -173,11 +173,10 @@ public class ExampleAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Example> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Example.class, vr);
}
@Override
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 9a01692..1536661 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
@@ -179,11 +179,10 @@ public class MarshalledAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Marshalled> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Marshalled.class, vr);
}
@Override
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 1e567d4..aea959b 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
@@ -128,11 +128,10 @@ public class NamePropertyAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<NameProperty> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(NameProperty.class, vr);
}
@Override
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 5b81c9f..01fc26f 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
@@ -128,11 +128,10 @@ public class ParentPropertyAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<ParentProperty> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(ParentProperty.class, vr);
}
@Override
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 76def5b..73238bd 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
@@ -232,11 +232,10 @@ public class SwapAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Swap> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Swap.class, vr);
}
@Override
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 4ccd18a..f11e7e2 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
@@ -151,11 +151,10 @@ public class UriAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Uri> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Uri.class, vr);
}
@Override
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 a8d4463..e6a1731 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
@@ -152,11 +152,10 @@ public class CsvAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Csv> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Csv.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
index 04cec71..61bf35c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
@@ -29,11 +29,10 @@ public class CsvConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<CsvConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(CsvConfig.class, vr);
}
@Override
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 856c397..359bbf3 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
@@ -272,11 +272,10 @@ public class HtmlAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Html> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Html.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
index abdf8c3..eba219f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
@@ -31,11 +31,10 @@ public class HtmlConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<HtmlConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(HtmlConfig.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
index 687089e..c69ec43 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
@@ -37,11 +37,10 @@ public class HtmlDocConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<HtmlDocConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(HtmlDocConfig.class, vr);
}
@Override
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 20d9759..557fb44 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
@@ -179,11 +179,10 @@ public class HtmlLinkAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<HtmlLink> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(HtmlLink.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
index 906817b..67d860f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
@@ -364,11 +364,10 @@ public class BodyAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Body> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Body.class, vr);
}
@Override
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 27eba1f..12099cb 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
@@ -1081,11 +1081,10 @@ public class FormDataAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<FormData> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(FormData.class, vr);
}
@Override
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 b9ac98c..dbf7a66 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
@@ -1082,11 +1082,10 @@ public class HeaderAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Header> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Header.class, vr);
}
@Override
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 3509f9c..ea86089 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
@@ -992,11 +992,10 @@ public class PathAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Path> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Path.class, vr);
}
@Override
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 5bcd6ac..5cae03c 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
@@ -1081,11 +1081,10 @@ public class QueryAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Query> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Query.class, vr);
}
@Override
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 165746b..78dc1e5 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
@@ -182,11 +182,10 @@ public class RequestAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Request> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Request.class, vr);
}
@Override
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 215926f..1e4f5a3 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
@@ -408,11 +408,10 @@ public class ResponseAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Response> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Response.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
index 3e24e7e..ba0df32 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
@@ -146,11 +146,10 @@ public class ResponseBodyAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<ResponseBody> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(ResponseBody.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
index 9b0eade..d884854 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
@@ -982,11 +982,10 @@ public class ResponseHeaderAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<ResponseHeader> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(ResponseHeader.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
index 61c5e11..5502be3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
@@ -146,11 +146,10 @@ public class ResponseStatusAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<ResponseStatus> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(ResponseStatus.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
index e10bb68..891d7ef 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
@@ -152,11 +152,10 @@ public class JsoAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Jso> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Jso.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
index c77f23d..9922fc9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
@@ -29,11 +29,10 @@ public class JsoConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<JsoConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(JsoConfig.class, vr);
}
@Override
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 6652c97..18ad253 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
@@ -174,11 +174,10 @@ public class JsonAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Json> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Json.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
index 47ea680..5554326 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
@@ -32,11 +32,10 @@ public class JsonConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<JsonConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(JsonConfig.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
index 19d58a2..4119f35 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
@@ -33,11 +33,10 @@ public class JsonSchemaConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<JsonSchemaConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(JsonSchemaConfig.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
index 8e291bc..5a4f1a2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
@@ -1285,11 +1285,10 @@ public class SchemaAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Schema> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Schema.class, vr);
}
@Override
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 4798fb3..41a409b 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
@@ -152,11 +152,10 @@ public class MsgPackAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<MsgPack> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(MsgPack.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
index 57dcf05..530a9bf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
@@ -31,11 +31,10 @@ public class MsgPackConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<MsgPackConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(MsgPackConfig.class, vr);
}
@Override
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 6530aa9..da4ab2f 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
@@ -152,11 +152,10 @@ public class OpenApiAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<OpenApi> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(OpenApi.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
index db97028..8148a45 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
@@ -31,11 +31,10 @@ public class OpenApiConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<OpenApiConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(OpenApiConfig.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
index 8e9036e..a8284c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
@@ -35,11 +35,10 @@ public class ParserConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<ParserConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(ParserConfig.class, vr);
}
@Override
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 50d599a..3ea7da4 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
@@ -152,11 +152,10 @@ public class PlainTextAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<PlainText> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(PlainText.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
index 0c93486..2eea11c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
@@ -29,11 +29,10 @@ public class PlainTextConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<PlainTextConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(PlainTextConfig.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index 1fb2a78..b891ce2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -180,14 +180,13 @@ public class AnnotationInfo<T extends Annotation> {
if (configApplyConstructor == null) {
ContextPropertiesApply cpa =
a.annotationType().getAnnotation(ContextPropertiesApply.class);
if (cpa == null)
- configApplyConstructor =
ConfigApply.NoOp.class.getConstructor(Class.class, VarResolverSession.class);
+ configApplyConstructor =
ConfigApply.NoOp.class.getConstructor(VarResolverSession.class);
else
- configApplyConstructor = (Constructor<?
extends ConfigApply<?>>)cpa.value().getConstructor(Class.class,
VarResolverSession.class);
+ configApplyConstructor = (Constructor<?
extends ConfigApply<?>>)cpa.value().getConstructor(VarResolverSession.class);
if (configApplyConstructor == null)
throw new NoSuchFieldError("Could not
find ConfigApply constructor for annotation:\n" + toString());
}
- ClassInfo ci = getClassInfo();
- return (ConfigApply<Annotation>)
configApplyConstructor.newInstance(ci == null ? null : ci.inner(), vrs);
+ return (ConfigApply<Annotation>)
configApplyConstructor.newInstance(vrs);
} catch (InstantiationException | IllegalAccessException |
IllegalArgumentException | InvocationTargetException | NoSuchMethodException |
SecurityException e) {
throw new ExecutableException(e);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
index f673266..b176e4d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
@@ -36,11 +36,10 @@ public class SerializerConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<SerializerConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(SerializerConfig.class, vr);
}
@Override
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 a8f4c18..873c0e2 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
@@ -152,11 +152,10 @@ public class SoapXmlAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<SoapXml> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(SoapXml.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
index d61d14e..8268a34 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
@@ -31,11 +31,10 @@ public class SoapXmlConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<SoapXmlConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(SoapXmlConfig.class, vr);
}
@Override
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 1d62912..811fda7 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
@@ -152,11 +152,10 @@ public class UonAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Uon> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Uon.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
index bad24d0..f1f1544 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
@@ -32,11 +32,10 @@ public class UonConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<UonConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(UonConfig.class, vr);
}
@Override
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 c17d31f..267f14e 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
@@ -176,11 +176,10 @@ public class UrlEncodingAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<UrlEncoding> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(UrlEncoding.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
index 331a264..e759211 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
@@ -30,11 +30,10 @@ public class UrlEncodingConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<UrlEncodingConfig> c, VarResolverSession vr)
{
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(UrlEncodingConfig.class, vr);
}
@Override
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 8072893..afb34e7 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
@@ -230,11 +230,10 @@ public class XmlAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Xml> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Xml.class, vr);
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
index 1a0e8fe..8b1a716 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
@@ -33,11 +33,10 @@ public class XmlConfigAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<XmlConfig> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(XmlConfig.class, vr);
}
@Override
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 e3f1bcd..5f67640 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
@@ -1029,11 +1029,10 @@ public class RestAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<Rest> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(Rest.class, vr);
}
@Override
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 6f18469..2de97ab 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
@@ -444,11 +444,10 @@ public class RestDeleteAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<RestDelete> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(RestDelete.class, vr);
}
@Override
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 9018ee9..ae149f6 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
@@ -497,11 +497,10 @@ public class RestGetAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<RestGet> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(RestGet.class, vr);
}
@Override
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 18bb7a3..9b8d68a 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
@@ -599,11 +599,10 @@ public class RestOpAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<RestOp> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(RestOp.class, vr);
}
@Override
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 9a5a092..4d72b17 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
@@ -582,11 +582,10 @@ public class RestPostAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<RestPost> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(RestPost.class, vr);
}
@Override
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 75bce13..24f23c3 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
@@ -582,11 +582,10 @@ public class RestPutAnnotation {
/**
* Constructor.
*
- * @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(Class<RestPut> c, VarResolverSession vr) {
- super(c, vr);
+ public Apply(VarResolverSession vr) {
+ super(RestPut.class, vr);
}
@Override
