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 9a829842bd SonarQube bug fixes
9a829842bd is described below
commit 9a829842bddde839946aee546052759bc53d4581
Author: James Bognar <[email protected]>
AuthorDate: Thu Feb 5 13:10:39 2026 -0500
SonarQube bug fixes
---
.../juneau/bean/openapi3/SecurityRequirement.java | 3 +-
.../annotation/AppliedAnnotationObject.java | 46 ++++++++++++----------
.../juneau/commons/collections/SimpleMap.java | 6 ++-
.../apache/juneau/commons/inject/BeanCreator2.java | 9 +++--
.../apache/juneau/commons/reflect/Visibility.java | 9 +++--
.../apache/juneau/commons/settings/Settings.java | 5 ++-
.../main/java/org/apache/juneau/config/Config.java | 3 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 3 +-
.../main/java/org/apache/juneau/BeanContext.java | 20 +++++-----
.../java/org/apache/juneau/BeanContextable.java | 10 ++---
.../src/main/java/org/apache/juneau/Context.java | 10 +++--
.../java/org/apache/juneau/ContextSession.java | 4 +-
.../org/apache/juneau/html/HtmlParserSession.java | 18 ++++-----
.../apache/juneau/html/HtmlSerializerSession.java | 29 +++++++-------
.../apache/juneau/httppart/BaseHttpPartParser.java | 3 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 3 +-
.../org/apache/juneau/rest/client/RestClient.java | 4 +-
.../org/apache/juneau/rest/client/RestRequest.java | 3 +-
.../java/org/apache/juneau/rest/RestContext.java | 33 ++++++++--------
.../java/org/apache/juneau/rest/RestOpContext.java | 39 +++++++++---------
20 files changed, 144 insertions(+), 116 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
index a781b94ea9..eb53efbd2b 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
@@ -38,6 +38,7 @@ public class SecurityRequirement extends OpenApiElement {
// Argument name constants for assertArgNotNull
private static final String ARG_property = "property";
private static final String ARG_schemeName = "schemeName";
+ private static final String ARG_scopes = "scopes";
// Property name constants
private static final String PROP_requirements = "requirements";
@@ -68,7 +69,7 @@ public class SecurityRequirement extends OpenApiElement {
*/
public SecurityRequirement addRequirement(String schemeName,
String...scopes) {
assertArgNotNull(ARG_schemeName, schemeName);
- assertArgNoNulls("scopes", scopes);
+ assertArgNoNulls(ARG_scopes, scopes);
if (requirements == null)
requirements = new LinkedHashMap<>();
requirements.put(schemeName, l(scopes));
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/annotation/AppliedAnnotationObject.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/annotation/AppliedAnnotationObject.java
index 3a4ebb79bb..66b1692da0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/annotation/AppliedAnnotationObject.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/annotation/AppliedAnnotationObject.java
@@ -121,6 +121,10 @@ import org.apache.juneau.commons.reflect.*;
*/
public class AppliedAnnotationObject extends AnnotationObject {
+ // Argument name constants for assertArgNoNulls
+ private static final String ARG_value = "value";
+ private static final String ARG_values = "values";
+
//-----------------------------------------------------------------------------------------------------------------
// Static
//-----------------------------------------------------------------------------------------------------------------
@@ -168,7 +172,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public Builder on(String...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
for (var v : values)
on = addAll(on, v);
return this;
@@ -214,7 +218,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderC on(Constructor<?>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -227,7 +231,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderC on(ConstructorInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
@@ -274,7 +278,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderM on(Method...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -287,7 +291,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderM on(MethodInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
@@ -337,7 +341,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderMF on(Field...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -350,7 +354,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderMF on(FieldInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
@@ -363,7 +367,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderMF on(Method...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -376,7 +380,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderMF on(MethodInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
@@ -432,7 +436,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderT on(Class<?>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
on = addAll(on, v.getName());
return this;
@@ -445,7 +449,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderT on(ClassInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
on = addAll(on, cn(v));
return this;
@@ -459,7 +463,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
*/
@SuppressWarnings("unchecked")
public BuilderT onClass(Class<?>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
onClass = addAll(onClass, v);
return this;
@@ -473,7 +477,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
*/
@SuppressWarnings("unchecked")
public BuilderT onClass(ClassInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
onClass = addAll(onClass, v.inner());
return this;
@@ -514,7 +518,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTM on(Method...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
on(info(v).getNameFull());
return this;
@@ -527,7 +531,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTM on(MethodInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
on(v.getNameFull());
return this;
@@ -582,7 +586,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTMF on(Field...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -595,7 +599,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTMF on(FieldInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
@@ -608,7 +612,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTMF on(Method...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -621,7 +625,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTMF on(MethodInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
@@ -665,7 +669,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTMFC on(Constructor<?>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(info(v).getNameFull());
return this;
@@ -678,7 +682,7 @@ public class AppliedAnnotationObject extends
AnnotationObject {
* @return This object.
*/
public BuilderTMFC on(ConstructorInfo...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
for (var v : value)
super.on(v.getNameFull());
return this;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
index 38fa7b027b..16035f0bdb 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SimpleMap.java
@@ -120,6 +120,10 @@ import org.apache.juneau.commons.utils.Utils;
*/
public class SimpleMap<K,V> extends AbstractMap<K,V> {
+ // Argument name constants for assertArgsNotNull
+ private static final String ARG_keys = "keys";
+ private static final String ARG_values = "values";
+
/**
* Inner class representing a single key-value entry in this map.
* <p>
@@ -207,7 +211,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
*/
@SuppressWarnings("unchecked")
public SimpleMap(K[] keys, V[] values) {
- assertArgsNotNull("keys", keys, "values", values);
+ assertArgsNotNull(ARG_keys, keys, ARG_values, values);
assertArg(keys.length == values.length, "keys ''{0}'' and
values ''{1}'' array lengths differ", keys.length, values.length);
// Check for duplicate keys
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
index 40cc8f53d4..7711920243 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
@@ -192,6 +192,7 @@ public class BeanCreator2<T> {
private static final String ARG_beanType = "beanType";
private static final String ARG_fallback = "fallback";
private static final String ARG_hook = "hook";
+ private static final String ARG_names = "names";
private static final String ARG_value = "value";
/** Default factory method names used for bean instantiation. */
@@ -579,7 +580,7 @@ public class BeanCreator2<T> {
*/
public BeanCreator2<T> builderClassNames(String... names) {
try (var writeLock = lock.write()) {
- builderClassNames = set(assertArgNoNulls("names",
names));
+ builderClassNames = set(assertArgNoNulls(ARG_names,
names));
reset();
}
return this;
@@ -615,7 +616,7 @@ public class BeanCreator2<T> {
*/
public BeanCreator2<T> builderMethodNames(String... names) {
try (var writeLock = lock.write()) {
- builderMethodNames = set(assertArgNoNulls("names",
names));
+ builderMethodNames = set(assertArgNoNulls(ARG_names,
names));
reset();
}
return this;
@@ -650,7 +651,7 @@ public class BeanCreator2<T> {
*/
public BeanCreator2<T> buildMethodNames(String... names) {
try (var writeLock = lock.write()) {
- buildMethodNames = set(assertArgNoNulls("names",
names));
+ buildMethodNames = set(assertArgNoNulls(ARG_names,
names));
reset();
}
return this;
@@ -794,7 +795,7 @@ public class BeanCreator2<T> {
*/
public BeanCreator2<T> factoryMethodNames(String... names) {
try (var writeLock = lock.write()) {
- factoryMethodNames = set(assertArgNoNulls("names",
names));
+ factoryMethodNames = set(assertArgNoNulls(ARG_names,
names));
reset();
}
return this;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
index 1711be3e5f..0b48793bb1 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Visibility.java
@@ -55,6 +55,9 @@ public enum Visibility {
/** Include all classes/fields/methods. */
PRIVATE;
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_x = "x";
+
/**
* Shortcut for <c>isVisible(x.getModifiers());</c>
*
@@ -123,7 +126,7 @@ public enum Visibility {
* @throws IllegalArgumentException If <c>x</c> is <jk>null</jk>.
*/
public <T> Constructor<T> transform(Constructor<T> x) {
- assertArgNotNull("x", x);
+ assertArgNotNull(ARG_x, x);
if (isVisible(x))
if (! setAccessible(x))
return null; // HTT
@@ -143,7 +146,7 @@ public enum Visibility {
* @throws IllegalArgumentException If <c>x</c> is <jk>null</jk>.
*/
public Field transform(Field x) {
- assertArgNotNull("x", x);
+ assertArgNotNull(ARG_x, x);
if (isVisible(x))
if (! setAccessible(x))
return null; // HTT
@@ -163,7 +166,7 @@ public enum Visibility {
* @throws IllegalArgumentException If <c>x</c> is <jk>null</jk>.
*/
public Method transform(Method x) {
- assertArgNotNull("x", x);
+ assertArgNotNull(ARG_x, x);
if (isVisible(x))
if (! setAccessible(x))
return null; // HTT
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
index 8a6f19c54f..fb6d3ab0f1 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
@@ -132,6 +132,9 @@ import org.apache.juneau.commons.reflect.*;
@SuppressWarnings("java:S115")
public class Settings {
+ // Argument name constants for assertArgNoNulls
+ private static final String ARG_sources = "sources";
+
// Argument name constants for assertArgNotNull
private static final String ARG_name = "name";
private static final String ARG_def = "def";
@@ -235,7 +238,7 @@ public class Settings {
*/
@SafeVarargs
public final Builder setSources(SettingSource...sources) {
- assertArgNoNulls("sources", sources);
+ assertArgNoNulls(ARG_sources, sources);
this.sources.clear();
for (var source : sources) {
this.sources.add(source);
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 3150342b70..c0356a0968 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -61,6 +61,7 @@ public class Config extends Context implements
ConfigEventListener {
private static final String ARG_value = "value";
private static final String ARG_section = "section";
private static final String ARG_key = "key";
+ private static final String ARG_values = "values";
// Property name constants
private static final String PROP_binaryFormat = "binaryFormat";
@@ -284,7 +285,7 @@ public class Config extends Context implements
ConfigEventListener {
* @return This object.
*/
public Builder mods(Mod...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
for (var value : values)
mods.put(value.getId(), value);
return this;
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index fc370dbeaf..80cfd58674 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -76,6 +76,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfMetaProvider {
// Argument name constants for assertArgNotNull
private static final String ARG_value = "value";
private static final String ARG_copyFrom = "copyFrom";
+ private static final String ARG_values = "values";
/**
* Builder class.
@@ -1198,7 +1199,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfMetaProvider {
* @return This object.
*/
public Builder namespaces(Namespace...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
namespaces = addAll(namespaces, values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index e2fd3d22c6..86e644e3a8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -620,7 +620,7 @@ public class BeanContext extends Context {
* @see #beanDictionary(ClassInfo...)
*/
public Builder beanDictionary(Collection<ClassInfo> values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
beanDictionary().addAll(0, values);
return this;
}
@@ -1781,7 +1781,7 @@ public class BeanContext extends Context {
*/
public Builder dictionaryOn(Class<?> on, Class<?>...values) {
assertArgNotNull(ARG_on, on);
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
return
annotations(BeanAnnotation.create(on).dictionary(values).build());
}
@@ -2712,7 +2712,7 @@ public class BeanContext extends Context {
* @see #notBeanClasses(ClassInfo...)
*/
public Builder notBeanClasses(Class<?>...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
return
notBeanClasses(Stream.of(values).map(ReflectionUtils::info).toArray(ClassInfo[]::new));
}
@@ -2766,7 +2766,7 @@ public class BeanContext extends Context {
* @return This object.
*/
public Builder notBeanClasses(ClassInfo...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
notBeanClasses().addAll(l(values));
return this;
}
@@ -2781,7 +2781,7 @@ public class BeanContext extends Context {
* @see #notBeanClasses(ClassInfo...)
*/
public Builder notBeanClasses(Collection<ClassInfo> values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
notBeanClasses().addAll(values);
return this;
}
@@ -2809,7 +2809,7 @@ public class BeanContext extends Context {
* @see #notBeanPackages(String...)
*/
public Builder notBeanPackages(Collection<String> values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
notBeanPackages().addAll(values);
return this;
}
@@ -2852,7 +2852,7 @@ public class BeanContext extends Context {
* @return This object.
*/
public Builder notBeanPackages(String...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
return notBeanPackages(l(values));
}
@@ -3031,7 +3031,7 @@ public class BeanContext extends Context {
* @return This object.
*/
public Builder sortProperties(Class<?>...on) {
- assertArgNoNulls("on", on);
+ assertArgNoNulls(ARG_on, on);
for (var c : on)
annotations(BeanAnnotation.create(c).sort(true).build());
return this;
@@ -3171,7 +3171,7 @@ public class BeanContext extends Context {
* @return This object.
*/
public Builder swaps(Class<?>...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
swaps().addAll(0, accumulate(values));
return this;
}
@@ -3259,7 +3259,7 @@ public class BeanContext extends Context {
* @return This object.
*/
public Builder swaps(Object...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
swaps().addAll(0, accumulate(values));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index 1cf33db58e..a8d51bf76f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -2327,7 +2327,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder notBeanClasses(Class<?>...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
bcBuilder.notBeanClasses(values);
return this;
}
@@ -2374,7 +2374,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder notBeanPackages(String...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
bcBuilder.notBeanPackages(values);
return this;
}
@@ -2551,7 +2551,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder sortProperties(Class<?>...on) {
- assertArgNoNulls("on", on);
+ assertArgNoNulls(ARG_on, on);
bcBuilder.sortProperties(on);
return this;
}
@@ -2673,7 +2673,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder swaps(Class<?>...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
bcBuilder.swaps(values);
return this;
}
@@ -2765,7 +2765,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder swaps(Object...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
bcBuilder.swaps(values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 5cd1af0a16..6465d2c82e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -83,6 +83,8 @@ public abstract class Context {
private static final String ARG_work = "work";
private static final String ARG_subtype = "subtype";
private static final String ARG_c = "c";
+ private static final String ARG_values = "values";
+ private static final String ARG_from = "from";
/**
* Builder class.
@@ -314,7 +316,7 @@ public abstract class Context {
* @return This object.
*/
public Builder annotations(Annotation...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
annotations(l(values));
return this;
}
@@ -376,7 +378,7 @@ public abstract class Context {
* @return This object.
*/
public Builder applyAnnotations(Class<?>...from) {
- assertArgNoNulls("from", from);
+ assertArgNoNulls(ARG_from, from);
return applyAnnotations((Object[])from);
}
@@ -464,7 +466,7 @@ public abstract class Context {
* @return This object.
*/
public Builder applyAnnotations(Object...from) {
- assertArgNoNulls("from", from);
+ assertArgNoNulls(ARG_from, from);
var work = AnnotationWorkList.create();
Arrays.stream(from).forEach(x -> traverse(work, x));
return apply(work);
@@ -705,7 +707,7 @@ public abstract class Context {
* <br>Cannot contain <jk>null</jk> values.
*/
protected void registerBuilders(Object...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
for (var b : values) {
if (b == this)
builders.add(b);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
index a2fc878ead..25c5a39cc7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
@@ -48,6 +48,8 @@ public abstract class ContextSession {
// Argument name constants for assertArgNotNull
private static final String ARG_ctx = "ctx";
private static final String ARG_value = "value";
+ private static final String ARG_msg = "msg";
+ private static final String ARG_args = "args";
private static final String ARG_type = "type";
private static final String ARG_apply = "apply";
private static final String ARG_key = "key";
@@ -209,7 +211,7 @@ public abstract class ContextSession {
* <br>Cannot contain <jk>null</jk> values.
*/
public void addWarning(String msg, Object...args) {
- assertArgsNotNull("msg", msg, "args", args);
+ assertArgsNotNull(ARG_msg, msg, ARG_args, args);
if (unmodifiable)
return;
if (warnings == null)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 40989864a0..98a1307edf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -60,8 +60,8 @@ public class HtmlParserSession extends XmlParserSession {
private static final String ARG_ctx = "ctx";
// HTML tag name constants
- private static final String HTMLTAG_array = "array";
- private static final String HTMLTAG_object = "object";
+ private static final String TAG_array = "array";
+ private static final String TAG_object = "object";
/**
* Builder class.
@@ -396,18 +396,18 @@ public class HtmlParserSession extends XmlParserSession {
} else if (tag == TABLE) {
- String typeName = getAttribute(r,
getBeanTypePropertyName(eType), HTMLTAG_object);
+ String typeName = getAttribute(r,
getBeanTypePropertyName(eType), TAG_object);
ClassMeta cm = getClassMeta(typeName, pMeta, eType);
if (nn(cm)) {
sType = eType = cm;
- typeName = sType.isCollectionOrArray() ?
HTMLTAG_array : HTMLTAG_object;
- } else if (! HTMLTAG_array.equals(typeName)) {
+ typeName = sType.isCollectionOrArray() ?
TAG_array : TAG_object;
+ } else if (! TAG_array.equals(typeName)) {
// Type name could be a subtype name.
- typeName = sType.isCollectionOrArray() ?
HTMLTAG_array : HTMLTAG_object;
+ typeName = sType.isCollectionOrArray() ?
TAG_array : TAG_object;
}
- if (typeName.equals(HTMLTAG_object)) {
+ if (typeName.equals(TAG_object)) {
if (sType.isObject()) {
o = parseIntoMap(r,
newGenericMap(sType), sType.getKeyType(), sType.getValueType(), pMeta);
} else if (sType.isMap()) {
@@ -426,7 +426,7 @@ public class HtmlParserSession extends XmlParserSession {
}
skipTag(r, xTABLE);
- } else if (typeName.equals(HTMLTAG_array)) {
+ } else if (typeName.equals(TAG_array)) {
if (sType.isObject())
o = parseTableIntoCollection(r,
(Collection)new JsonList(this), sType, pMeta);
else if (sType.isCollection())
@@ -443,7 +443,7 @@ public class HtmlParserSession extends XmlParserSession {
}
} else if (tag == UL) {
- String typeName = getAttribute(r,
getBeanTypePropertyName(eType), HTMLTAG_array);
+ String typeName = getAttribute(r,
getBeanTypePropertyName(eType), TAG_array);
ClassMeta cm = getClassMeta(typeName, pMeta, eType);
if (nn(cm))
sType = eType = cm;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index dfd50f2142..fb12952d48 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -60,8 +60,9 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
private static final String ARG_ctx = "ctx";
// HTML tag name constants
- private static final String HTMLTAG_style = "style";
- private static final String HTMLTAG_table = "table";
+ private static final String TAG_style = "style";
+ private static final String TAG_table = "table";
+ private static final String TAG_array = "array";
/**
* Builder class.
@@ -409,7 +410,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
int i = indent;
- out.oTag(i, HTMLTAG_table);
+ out.oTag(i, TAG_table);
String typeName = m.getMeta().getDictionaryName();
if (nn(typeName) && eType != m.getClassMeta())
@@ -449,7 +450,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
out.oTag(i + 2, "td");
String style = getStyle(this, pMeta, value);
if (nn(style))
- out.attr(HTMLTAG_style, style);
+ out.attr(TAG_style, style);
out.cTag();
try {
@@ -469,7 +470,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
out.ie(i + 1).eTag("tr").nl(i + 1);
});
- out.ie(i).eTag(HTMLTAG_table).nl(i);
+ out.ie(i).eTag(TAG_table).nl(i);
}
@SuppressWarnings({ "rawtypes", "unchecked", "java:S3776", "java:S6541"
})
@@ -494,7 +495,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
if (sType != eType)
type2 = sType.getBeanDictionaryName();
if (type2 == null)
- type2 = "array";
+ type2 = TAG_array;
c = sort(c);
@@ -508,7 +509,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
if (nn(th)) {
- out.oTag(i, HTMLTAG_table).attr(btpn,
type2).w('>').nl(i + 1);
+ out.oTag(i, TAG_table).attr(btpn, type2).w('>').nl(i +
1);
if (th.length > 0) {
out.sTag(i + 1, "tr").nl(i + 2);
for (var key : th) {
@@ -581,7 +582,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
String style =
getStyle(this, pMeta, value);
out.oTag(i + 2, "td");
if (nn(style))
-
out.attr(HTMLTAG_style, style);
+
out.attr(TAG_style, style);
out.cTag();
if (nn(link))
out.oTag("a").attrUri("href", link).cTag();
@@ -596,11 +597,11 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
}
out.ie(i + 1).eTag("tr").nl(i + 1);
}
- out.ie(i).eTag(HTMLTAG_table).nl(i);
+ out.ie(i).eTag(TAG_table).nl(i);
} else {
out.oTag(i, isDc ? "p" : "ul");
- if (! type2.equals("array"))
+ if (! type2.equals(TAG_array))
out.attr(btpn, type2);
out.w('>').nl(i + 1);
var isFirst = true;
@@ -612,7 +613,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
String style = getStyle(this, ppMeta, o);
String link = getLink(ppMeta);
if (nn(style) && ! isDc)
- out.attr(HTMLTAG_style, style);
+ out.attr(TAG_style, style);
if (! isDc)
out.cTag();
if (nn(link))
@@ -641,7 +642,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
int i = indent;
- out.oTag(i, HTMLTAG_table);
+ out.oTag(i, TAG_table);
if (nn(typeName) && nn(ppMeta) && ppMeta.getClassMeta() !=
aType)
out.attr(getBeanTypePropertyName(sType), typeName);
@@ -656,7 +657,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
forEachEntry(m, x -> serializeMapEntry(out, x, keyType,
valueType, i, ppMeta));
- out.ie(i).eTag(HTMLTAG_table).nl(i);
+ out.ie(i).eTag(TAG_table).nl(i);
}
@SuppressWarnings("rawtypes")
@@ -677,7 +678,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
out.sTag(i + 1, "tr").nl(i + 2);
out.oTag(i + 2, "td");
if (nn(style))
- out.attr(HTMLTAG_style, style);
+ out.attr(TAG_style, style);
out.cTag();
if (nn(link))
out.oTag(i + 3, "a").attrUri("href",
link.replace("{#}", s(value))).cTag();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
index d5ff30951e..bbbd7f0b67 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
@@ -39,6 +39,7 @@ public abstract class BaseHttpPartParser extends
BeanContextable implements Http
// Argument name constants for assertArgNotNull
private static final String ARG_toType = "toType";
+ private static final String ARG_toTypeArgs = "toTypeArgs";
private static final String ARG_builder = "builder";
/**
@@ -146,7 +147,7 @@ public abstract class BaseHttpPartParser extends
BeanContextable implements Http
* @throws SchemaValidationException If the input or resulting HTTP
part object fails schema validation.
*/
public <T> T parse(HttpPartType partType, HttpPartSchema schema, String
in, Type toType, Type...toTypeArgs) throws ParseException,
SchemaValidationException {
- assertArgNoNulls("toTypeArgs", toTypeArgs);
+ assertArgNoNulls(ARG_toTypeArgs, toTypeArgs);
return getPartSession().parse(partType, schema, in,
getClassMeta(assertArgNotNull(ARG_toType, toType), toTypeArgs));
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index a334ec9edd..66d65644c4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -148,6 +148,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
// Argument name constants for assertArgNotNull
private static final String ARG_copyFrom = "copyFrom";
private static final String ARG_builder = "builder";
+ private static final String ARG_values = "values";
/**
* Builder class.
@@ -840,7 +841,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
* @return This object.
*/
public Builder namespaces(Namespace...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
namespaces = addAll(namespaces, values);
return this;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 300a53fb95..e4c8684643 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -4851,7 +4851,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
*/
@SuppressWarnings("unchecked")
public Builder serializers(Class<? extends Serializer>...value)
{
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
serializers().add(value);
return this;
}
@@ -4890,7 +4890,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder serializers(Serializer...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
serializers().add(value);
return this;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index d4ce9489ea..9a27da6085 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -114,6 +114,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
private static final String ARG_parser = "parser";
private static final String ARG_uri = "uri";
private static final String ARG_value = "value";
+ private static final String ARG_interceptors = "interceptors";
private class SimpleFormData extends SimplePart {
SimpleFormData(NameValuePair x) {
@@ -1236,7 +1237,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
* @throws RestCallException If init method on interceptor threw an
exception.
*/
public RestRequest interceptors(RestCallInterceptor...interceptors)
throws RestCallException {
- assertArgNoNulls("interceptors", interceptors);
+ assertArgNoNulls(ARG_interceptors, interceptors);
try {
for (var i : interceptors) {
this.interceptors.add(i);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 137d63d420..b60c8461d7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -152,6 +152,7 @@ public class RestContext extends Context {
// Argument name constants for assertArgNotNull
private static final String ARG_value = "value";
+ private static final String ARG_values = "values";
private static final String ARG_path = "path";
private static final String ARG_key = "key";
private static final String ARG_resource = "resource";
@@ -888,7 +889,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder children(Object...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
addAll(children, values);
return this;
}
@@ -1079,7 +1080,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder consumes(MediaType...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
consumes = addAll(consumes, values);
return this;
}
@@ -1262,7 +1263,7 @@ public class RestContext extends Context {
* @see #defaultClasses()
*/
public Builder defaultClasses(Class<?>...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
defaultClasses().add(values);
return this;
}
@@ -1342,7 +1343,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder
defaultRequestAttributes(NamedAttribute...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
defaultRequestAttributes().add(values);
return this;
}
@@ -1415,7 +1416,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder defaultRequestHeaders(Header...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
defaultRequestHeaders().setDefault(values);
return this;
}
@@ -1484,7 +1485,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder defaultResponseHeaders(Header...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
defaultResponseHeaders().setDefault(values);
return this;
}
@@ -2365,7 +2366,7 @@ public class RestContext extends Context {
*/
@SafeVarargs
public final Builder parsers(Class<? extends Parser>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
parsers().add(value);
return this;
}
@@ -2389,7 +2390,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder parsers(Parser...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
parsers().add(value);
return this;
}
@@ -2718,7 +2719,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder produces(MediaType...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
produces = addAll(produces, values);
return this;
}
@@ -2895,7 +2896,7 @@ public class RestContext extends Context {
*/
@SafeVarargs
public final Builder responseProcessors(Class<? extends
ResponseProcessor>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
responseProcessors().add(value);
return this;
}
@@ -2919,7 +2920,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder responseProcessors(ResponseProcessor...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
responseProcessors().add(value);
return this;
}
@@ -3021,7 +3022,7 @@ public class RestContext extends Context {
*/
@SafeVarargs
public final Builder restOpArgs(Class<? extends
RestOpArg>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
restOpArgs().add(value);
return this;
}
@@ -3189,7 +3190,7 @@ public class RestContext extends Context {
*/
@SafeVarargs
public final Builder serializers(Class<? extends
Serializer>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
serializers().add(value);
return this;
}
@@ -3213,7 +3214,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder serializers(Serializer...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
serializers().add(value);
return this;
}
@@ -3806,7 +3807,7 @@ public class RestContext extends Context {
*/
@SafeVarargs
public final Builder vars(Class<? extends Var>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
varResolver.vars(value);
return this;
}
@@ -3830,7 +3831,7 @@ public class RestContext extends Context {
* @return This object.
*/
public Builder vars(Var...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
varResolver.vars(value);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index c8dc56466c..07ceddf25a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -92,6 +92,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// Argument name constants for assertArgNotNull
private static final String ARG_beanType = "beanType";
private static final String ARG_value = "value";
+ private static final String ARG_values = "values";
private static final AnnotationProvider AP =
AnnotationProvider.INSTANCE;
@@ -394,7 +395,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder consumes(MediaType...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
consumes = addAll(consumes, values);
return this;
}
@@ -564,7 +565,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder defaultRequestAttributes(NamedAttribute...value)
{
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
defaultRequestAttributes().add(value);
return this;
}
@@ -594,7 +595,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder defaultRequestFormData(NameValuePair...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
defaultRequestFormData().append(value);
return this;
}
@@ -624,7 +625,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder
defaultRequestHeaders(org.apache.http.Header...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
defaultRequestHeaders().append(value);
return this;
}
@@ -654,7 +655,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder defaultRequestQueryData(NameValuePair...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
defaultRequestQueryData().append(value);
return this;
}
@@ -684,7 +685,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder
defaultResponseHeaders(org.apache.http.Header...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
defaultResponseHeaders().append(value);
return this;
}
@@ -725,7 +726,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@SafeVarargs
public final Builder encoders(Class<? extends Encoder>...value)
{
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
encoders().add(value);
return this;
}
@@ -744,7 +745,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder encoders(Encoder...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
encoders().add(value);
return this;
}
@@ -775,7 +776,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@SafeVarargs
public final Builder guards(Class<? extends RestGuard>...value)
{
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
guards().append(value);
return this;
}
@@ -794,7 +795,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder guards(RestGuard...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
guards().append(value);
return this;
}
@@ -939,7 +940,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@SafeVarargs
public final Builder matchers(Class<? extends
RestMatcher>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
matchers().append(value);
return this;
}
@@ -958,7 +959,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder matchers(RestMatcher...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
matchers().append(value);
return this;
}
@@ -1054,7 +1055,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@SafeVarargs
public final Builder parsers(Class<? extends Parser>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
parsers().add(value);
return this;
}
@@ -1073,7 +1074,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder parsers(Parser...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
parsers().add(value);
return this;
}
@@ -1192,7 +1193,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder path(String...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
path = prependAll(path, values);
return this;
}
@@ -1225,7 +1226,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder produces(MediaType...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
produces = addAll(produces, values);
return this;
}
@@ -1323,7 +1324,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder rolesDeclared(String...values) {
- assertArgNoNulls("values", values);
+ assertArgNoNulls(ARG_values, values);
rolesDeclared = addAll(rolesDeclared, values);
return this;
}
@@ -1354,7 +1355,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@SafeVarargs
public final Builder serializers(Class<? extends
Serializer>...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
serializers().add(value);
return this;
}
@@ -1373,7 +1374,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* @return This object.
*/
public Builder serializers(Serializer...value) {
- assertArgNoNulls("value", value);
+ assertArgNoNulls(ARG_value, value);
serializers().add(value);
return this;
}
