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 b4508e376e SonarQube bug fixes
b4508e376e is described below
commit b4508e376eed0d75a69648f41bd484eab45f1d96
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 13:16:42 2026 -0500
SonarQube bug fixes
---
.../org/apache/juneau/bean/openapi3/OpenApi.java | 3 +-
.../org/apache/juneau/bean/swagger/Swagger.java | 3 +-
.../apache/juneau/commons/io/MimeTypeDetector.java | 14 ++--
.../java/org/apache/juneau/BeanContextable.java | 76 ++++++++++++----------
.../java/org/apache/juneau/BeanPropertyMeta.java | 21 +++---
.../main/java/org/apache/juneau/BeanSession.java | 9 ++-
.../org/apache/juneau/BeanTraverseSession.java | 6 +-
.../java/org/apache/juneau/ContextSession.java | 9 ++-
.../org/apache/juneau/html/HtmlParserSession.java | 11 ++--
.../apache/juneau/html/HtmlSerializerSession.java | 11 ++--
.../apache/juneau/json/JsonSerializerSession.java | 11 ++--
.../jsonschema/JsonSchemaGeneratorSession.java | 8 ++-
.../serializer/OutputStreamSerializerSession.java | 8 ++-
.../juneau/serializer/SerializerSession.java | 8 ++-
.../juneau/serializer/WriterSerializerSession.java | 8 ++-
.../apache/juneau/xml/XmlSerializerSession.java | 11 ++--
.../org/apache/juneau/rest/client/RestClient.java | 31 +++++----
.../apache/juneau/rest/rrpc/RrpcRestOpSession.java | 2 +-
18 files changed, 159 insertions(+), 91 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
index 24cd11ede0..87d14194e9 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
@@ -83,6 +83,7 @@ public class OpenApi extends OpenApiElement {
private static final String ARG_path = "path";
private static final String ARG_pathItem = "pathItem";
private static final String ARG_property = "property";
+ private static final String ARG_ref = "ref";
/** Represents a null OpenAPI document */
public static final OpenApi NULL = new OpenApi();
@@ -270,7 +271,7 @@ public class OpenApi extends OpenApiElement {
* @return The referenced node, or <jk>null</jk> if not found.
*/
public <T> T findRef(String ref, Class<T> c) {
- assertArgNotNullOrBlank("ref", ref);
+ assertArgNotNullOrBlank(ARG_ref, ref);
assertArgNotNull(ARG_c, c);
if (! ref.startsWith("#/"))
throw rex("Unsupported reference: ''{0}''", ref);
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
index 8841fad05e..afe2244824 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
@@ -98,6 +98,7 @@ public class Swagger extends SwaggerElement {
private static final String ARG_parameter = "parameter";
private static final String ARG_path = "path";
private static final String ARG_property = "property";
+ private static final String ARG_ref = "ref";
private static final String ARG_response = "response";
private static final String ARG_scheme = "scheme";
private static final String ARG_schema = "schema";
@@ -515,7 +516,7 @@ public class Swagger extends SwaggerElement {
* @return The referenced node, or <jk>null</jk> if not found.
*/
public <T> T findRef(String ref, Class<T> c) {
- assertArgNotNullOrBlank("ref", ref);
+ assertArgNotNullOrBlank(ARG_ref, ref);
assertArgNotNull(ARG_c, c);
if (! ref.startsWith("#/"))
throw rex("Unsupported reference: ''{0}''", ref);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
index 85dc3028b3..a179c3d329 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
@@ -67,7 +67,13 @@ public class MimeTypeDetector {
/**
* Builder class for creating MimeTypeDetector instances.
*/
+ @SuppressWarnings("java:S115")
public static class Builder {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ext = "ext";
+ private static final String ARG_type = "type";
+ private static final String ARG_name = "name";
+
private final Map<String,String> extMap = new
ConcurrentHashMap<>();
private final Map<String,String> fileMap = new
ConcurrentHashMap<>();
private boolean nioContentBasedDetection = true;
@@ -102,8 +108,8 @@ public class MimeTypeDetector {
* @throws IllegalArgumentException If ext or type is null or
blank.
*/
public Builder addExtensionType(String ext, String type) {
- assertArgNotNullOrBlank("ext", ext);
- assertArgNotNullOrBlank("type", type);
+ assertArgNotNullOrBlank(ARG_ext, ext);
+ assertArgNotNullOrBlank(ARG_type, type);
extMap.put(ext.toLowerCase(), type);
return this;
}
@@ -117,8 +123,8 @@ public class MimeTypeDetector {
* @throws IllegalArgumentException If name or type is null or
blank.
*/
public Builder addFileType(String name, String type) {
- assertArgNotNullOrBlank("name", name);
- assertArgNotNullOrBlank("type", type);
+ assertArgNotNullOrBlank(ARG_name, name);
+ assertArgNotNullOrBlank(ARG_type, type);
fileMap.put(name, type);
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 9a02f9365e..d1d57e7e74 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
@@ -46,9 +46,19 @@ import org.apache.juneau.swap.*;
*/
public abstract class BeanContextable extends Context {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_value = "value";
+ private static final String ARG_operation = "operation";
+ private static final String ARG_on = "on";
+ private static final String ARG_properties = "properties";
+ private static final String ARG_values = "values";
+ private static final String ARG_beanClassName = "beanClassName";
+ private static final String ARG_pojoClass = "pojoClass";
+
/**
* Builder class.
*/
+ @SuppressWarnings("java:S115")
public abstract static class Builder extends Context.Builder {
private BeanContext.Builder bcBuilder;
@@ -156,7 +166,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanClassVisibility(Visibility value) {
- bcBuilder.beanClassVisibility(assertArgNotNull("value",
value));
+
bcBuilder.beanClassVisibility(assertArgNotNull(ARG_value, value));
return this;
}
@@ -205,7 +215,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanConstructorVisibility(Visibility value) {
-
bcBuilder.beanConstructorVisibility(assertArgNotNull("value", value));
+
bcBuilder.beanConstructorVisibility(assertArgNotNull(ARG_value, value));
return this;
}
@@ -231,7 +241,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanContext(BeanContext value) {
- bc = assertArgNotNull("value", value);
+ bc = assertArgNotNull(ARG_value, value);
return this;
}
@@ -248,7 +258,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanContext(BeanContext.Builder value) {
- bcBuilder = assertArgNotNull("value", value);
+ bcBuilder = assertArgNotNull(ARG_value, value);
return this;
}
@@ -260,7 +270,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public final Builder beanContext(Consumer<BeanContext.Builder>
operation) {
- assertArgNotNull("operation", operation);
+ assertArgNotNull(ARG_operation, operation);
operation.accept(beanContext());
return this;
}
@@ -415,7 +425,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanFieldVisibility(Visibility value) {
- bcBuilder.beanFieldVisibility(assertArgNotNull("value",
value));
+
bcBuilder.beanFieldVisibility(assertArgNotNull(ARG_value, value));
return this;
}
@@ -472,7 +482,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanInterceptor(Class<?> on, Class<? extends
BeanInterceptor<?>> value) {
- bcBuilder.beanInterceptor(assertArgNotNull("on", on),
assertArgNotNull("value", value));
+ bcBuilder.beanInterceptor(assertArgNotNull(ARG_on, on),
assertArgNotNull(ARG_value, value));
return this;
}
@@ -555,7 +565,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanMethodVisibility(Visibility value) {
-
bcBuilder.beanMethodVisibility(assertArgNotNull("value", value));
+
bcBuilder.beanMethodVisibility(assertArgNotNull(ARG_value, value));
return this;
}
@@ -616,7 +626,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanProperties(Class<?> beanClass, String
properties) {
- bcBuilder.beanProperties(beanClass,
assertArgNotNull("properties", properties));
+ bcBuilder.beanProperties(beanClass,
assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -679,7 +689,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanProperties(Map<String,Object> values) {
- bcBuilder.beanProperties(assertArgNotNull("values",
values));
+ bcBuilder.beanProperties(assertArgNotNull(ARG_values,
values));
return this;
}
@@ -743,7 +753,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanProperties(String beanClassName, String
properties) {
-
bcBuilder.beanProperties(assertArgNotNull("beanClassName", beanClassName),
assertArgNotNull("properties", properties));
+
bcBuilder.beanProperties(assertArgNotNull(ARG_beanClassName, beanClassName),
assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -796,7 +806,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesExcludes(Class<?> beanClass,
String properties) {
- bcBuilder.beanPropertiesExcludes(beanClass,
assertArgNotNull("properties", properties));
+ bcBuilder.beanPropertiesExcludes(beanClass,
assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -851,7 +861,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesExcludes(Map<String,Object>
values) {
-
bcBuilder.beanPropertiesExcludes(assertArgNotNull("values", values));
+
bcBuilder.beanPropertiesExcludes(assertArgNotNull(ARG_values, values));
return this;
}
@@ -907,7 +917,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesExcludes(String beanClassName,
String properties) {
-
bcBuilder.beanPropertiesExcludes(assertArgNotNull("beanClassName",
beanClassName), assertArgNotNull("properties", properties));
+
bcBuilder.beanPropertiesExcludes(assertArgNotNull(ARG_beanClassName,
beanClassName), assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -963,7 +973,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesReadOnly(Class<?> beanClass,
String properties) {
- bcBuilder.beanPropertiesReadOnly(beanClass,
assertArgNotNull("properties", properties));
+ bcBuilder.beanPropertiesReadOnly(beanClass,
assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -1021,7 +1031,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesReadOnly(Map<String,Object>
values) {
-
bcBuilder.beanPropertiesReadOnly(assertArgNotNull("values", values));
+
bcBuilder.beanPropertiesReadOnly(assertArgNotNull(ARG_values, values));
return this;
}
@@ -1080,7 +1090,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesReadOnly(String beanClassName,
String properties) {
-
bcBuilder.beanPropertiesReadOnly(assertArgNotNull("beanClassName",
beanClassName), assertArgNotNull("properties", properties));
+
bcBuilder.beanPropertiesReadOnly(assertArgNotNull(ARG_beanClassName,
beanClassName), assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -1135,7 +1145,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesWriteOnly(Class<?> beanClass,
String properties) {
- bcBuilder.beanPropertiesWriteOnly(beanClass,
assertArgNotNull("properties", properties));
+ bcBuilder.beanPropertiesWriteOnly(beanClass,
assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -1192,7 +1202,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesWriteOnly(Map<String,Object>
values) {
-
bcBuilder.beanPropertiesWriteOnly(assertArgNotNull("values", values));
+
bcBuilder.beanPropertiesWriteOnly(assertArgNotNull(ARG_values, values));
return this;
}
@@ -1250,7 +1260,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder beanPropertiesWriteOnly(String beanClassName,
String properties) {
-
bcBuilder.beanPropertiesWriteOnly(assertArgNotNull("beanClassName",
beanClassName), assertArgNotNull("properties", properties));
+
bcBuilder.beanPropertiesWriteOnly(assertArgNotNull(ARG_beanClassName,
beanClassName), assertArgNotNull(ARG_properties, properties));
return this;
}
@@ -1464,7 +1474,7 @@ public abstract class BeanContextable extends Context {
*/
public Builder dictionaryOn(Class<?> on, Class<?>...values) {
assertArgNoNulls("values", values);
- bcBuilder.dictionaryOn(assertArgNotNull("on", on),
values);
+ bcBuilder.dictionaryOn(assertArgNotNull(ARG_on, on),
values);
return this;
}
@@ -1695,7 +1705,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public <T> Builder example(Class<T> pojoClass, String json) {
- bcBuilder.example(assertArgNotNull("pojoClass",
pojoClass), json);
+ bcBuilder.example(assertArgNotNull(ARG_pojoClass,
pojoClass), json);
return this;
}
@@ -1746,7 +1756,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public <T> Builder example(Class<T> pojoClass, T o) {
- bcBuilder.example(assertArgNotNull("pojoClass",
pojoClass), o);
+ bcBuilder.example(assertArgNotNull(ARG_pojoClass,
pojoClass), o);
return this;
}
@@ -1837,7 +1847,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder findFluentSetters(Class<?> on) {
- bcBuilder.findFluentSetters(assertArgNotNull("on", on));
+ bcBuilder.findFluentSetters(assertArgNotNull(ARG_on,
on));
return this;
}
@@ -2065,7 +2075,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder implClasses(Map<Class<?>,Class<?>> values) {
- bcBuilder.implClasses(assertArgNotNull("values",
values));
+ bcBuilder.implClasses(assertArgNotNull(ARG_values,
values));
return this;
}
@@ -2113,7 +2123,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder interfaceClass(Class<?> on, Class<?> value) {
- bcBuilder.interfaceClass(assertArgNotNull("on", on),
assertArgNotNull("value", value));
+ bcBuilder.interfaceClass(assertArgNotNull(ARG_on, on),
assertArgNotNull(ARG_value, value));
return this;
}
@@ -2204,7 +2214,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder locale(Locale value) {
- bcBuilder.locale(assertArgNotNull("value", value));
+ bcBuilder.locale(assertArgNotNull(ARG_value, value));
return this;
}
@@ -2398,7 +2408,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder propertyNamer(Class<?> on, Class<? extends
PropertyNamer> value) {
- bcBuilder.propertyNamer(assertArgNotNull("on", on),
assertArgNotNull("value", value));
+ bcBuilder.propertyNamer(assertArgNotNull(ARG_on, on),
assertArgNotNull(ARG_value, value));
return this;
}
@@ -2445,7 +2455,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder propertyNamer(Class<? extends PropertyNamer>
value) {
- bcBuilder.propertyNamer(assertArgNotNull("value",
value));
+ bcBuilder.propertyNamer(assertArgNotNull(ARG_value,
value));
return this;
}
@@ -2580,7 +2590,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder stopClass(Class<?> on, Class<?> value) {
- bcBuilder.stopClass(assertArgNotNull("on", on),
assertArgNotNull("value", value));
+ bcBuilder.stopClass(assertArgNotNull(ARG_on, on),
assertArgNotNull(ARG_value, value));
return this;
}
@@ -2843,7 +2853,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder typeName(Class<?> on, String value) {
- bcBuilder.typeName(on, assertArgNotNull("value",
value));
+ bcBuilder.typeName(on, assertArgNotNull(ARG_value,
value));
return this;
}
@@ -2890,7 +2900,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder typePropertyName(Class<?> on, String value) {
- bcBuilder.typePropertyName(on,
assertArgNotNull("value", value));
+ bcBuilder.typePropertyName(on,
assertArgNotNull(ARG_value, value));
return this;
}
@@ -2948,7 +2958,7 @@ public abstract class BeanContextable extends Context {
* @return This object.
*/
public Builder typePropertyName(String value) {
- bcBuilder.typePropertyName(assertArgNotNull("value",
value));
+ bcBuilder.typePropertyName(assertArgNotNull(ARG_value,
value));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 15db18b4ee..dfc766fc29 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -60,9 +60,14 @@ import org.apache.juneau.swaps.*;
@SuppressWarnings({ "rawtypes", "unchecked" })
public class BeanPropertyMeta implements Comparable<BeanPropertyMeta> {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_value = "value";
+ private static final String ARG_innerField = "innerField";
+
/**
* BeanPropertyMeta builder class.
*/
+ @SuppressWarnings("java:S115")
public static class Builder {
BeanMeta<?> beanMeta; // Package-private for BeanMeta access
BeanContext bc; // Package-private for BeanMeta access
@@ -94,7 +99,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder beanRegistry(BeanRegistry value) {
- beanRegistry = assertArgNotNull("value", value);
+ beanRegistry = assertArgNotNull(ARG_value, value);
return this;
}
@@ -112,7 +117,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder delegateFor(BeanPropertyMeta value) {
- delegateFor = assertArgNotNull("value", value);
+ delegateFor = assertArgNotNull(ARG_value, value);
return this;
}
@@ -134,7 +139,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder rawMetaType(ClassMeta<?> value) {
- rawTypeMeta = assertArgNotNull("value", value);
+ rawTypeMeta = assertArgNotNull(ARG_value, value);
typeMeta = rawTypeMeta;
return this;
}
@@ -204,7 +209,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder setExtraKeys(MethodInfo value) {
- assertArgNotNull("value", value);
+ assertArgNotNull(ARG_value, value);
extraKeys = value.accessible();
return this;
}
@@ -216,7 +221,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder setField(FieldInfo value) {
- assertArgNotNull("value", value);
+ assertArgNotNull(ARG_value, value);
field = value.accessible();
innerField = field;
return this;
@@ -229,7 +234,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder setGetter(MethodInfo value) {
- assertArgNotNull("value", value);
+ assertArgNotNull(ARG_value, value);
getter = value.accessible();
return this;
}
@@ -241,7 +246,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder setInnerField(FieldInfo value) {
- innerField = assertArgNotNull("value", value);
+ innerField = assertArgNotNull(ARG_innerField, value);
return this;
}
@@ -252,7 +257,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return This object.
*/
public Builder setSetter(MethodInfo value) {
- assertArgNotNull("value", value);
+ assertArgNotNull(ARG_value, value);
setter = value.accessible();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index fed9b36791..58cd83bb95 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -51,9 +51,12 @@ import org.apache.juneau.swap.*;
* </ul>
*
*/
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings({ "unchecked", "rawtypes", "java:S115" })
public class BeanSession extends ContextSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
@@ -71,7 +74,7 @@ public class BeanSession extends ContextSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(BeanContext ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
mediaType = ctx.getMediaType();
timeZone = ctx.getTimeZone();
@@ -228,7 +231,7 @@ public class BeanSession extends ContextSession {
* @return A new builder.
*/
public static Builder create(BeanContext ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 9249ce1d02..999dd7bc2b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -47,8 +47,12 @@ import org.apache.juneau.commons.utils.*;
* </ul>
*
*/
+@SuppressWarnings("java:S115")
public class BeanTraverseSession extends BeanSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
@@ -64,7 +68,7 @@ public class BeanTraverseSession extends BeanSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(BeanTraverseContext ctx) {
- super(assertArgNotNull("ctx", ctx).getBeanContext());
+ super(assertArgNotNull(ARG_ctx, ctx).getBeanContext());
this.ctx = ctx;
initialDepth = ctx.getInitialDepth();
}
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 597d5cc819..14db33dc3d 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
@@ -39,8 +39,13 @@ import org.apache.juneau.commons.reflect.*;
* </ul>
*
*/
+@SuppressWarnings("java:S115")
public abstract class ContextSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+ private static final String ARG_value = "value";
+
/**
* Builder class.
*/
@@ -57,7 +62,7 @@ public abstract class ContextSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(Context ctx) {
- this.ctx = assertArgNotNull("ctx", ctx);
+ this.ctx = assertArgNotNull(ARG_ctx, ctx);
this.properties = memr(LinkedHashMap::new);
}
@@ -123,7 +128,7 @@ public abstract class ContextSession {
* @return This object.
*/
public Builder properties(Map<String,Object> value) {
- assertArgNotNull("value", value);
+ assertArgNotNull(ARG_value, value);
properties.reset();
properties.get().putAll(value);
return this;
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 b256dc2db8..27e82a3192 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
@@ -53,13 +53,16 @@ import org.apache.juneau.xml.*;
* </ul>
*/
-@SuppressWarnings({"unchecked","rawtypes","java:S110"})
+@SuppressWarnings({"unchecked","rawtypes","java:S110","java:S115"})
public class HtmlParserSession extends XmlParserSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
- @SuppressWarnings("java:S110")
+ @SuppressWarnings({"java:S110", "java:S115"})
public static class Builder extends XmlParserSession.Builder {
private HtmlParser ctx;
@@ -71,7 +74,7 @@ public class HtmlParserSession extends XmlParserSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(HtmlParser ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
}
@@ -187,7 +190,7 @@ public class HtmlParserSession extends XmlParserSession {
* @return A new builder.
*/
public static Builder create(HtmlParser ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private static String getAttribute(XmlReader r, String name, String
def) {
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 1738d5f011..327f9c78ac 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
@@ -53,13 +53,16 @@ import org.apache.juneau.xml.annotation.*;
* </ul>
*/
-@SuppressWarnings({"resource","java:S110"})
+@SuppressWarnings({"resource","java:S110","java:S115"})
public class HtmlSerializerSession extends XmlSerializerSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
- @SuppressWarnings("java:S110")
+ @SuppressWarnings({"java:S110", "java:S115"})
public static class Builder extends XmlSerializerSession.Builder {
private HtmlSerializer ctx;
@@ -71,7 +74,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(HtmlSerializer ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
}
@@ -197,7 +200,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
* @return A new builder.
*/
public static Builder create(HtmlSerializer ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private final HtmlSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index d408753cc3..eba3197880 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -43,13 +43,16 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JsonBasics";>JSON Basics</a>
* </ul>
*/
-@SuppressWarnings({"resource","java:S110"})
+@SuppressWarnings({"resource","java:S110","java:S115"})
public class JsonSerializerSession extends WriterSerializerSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
- @SuppressWarnings("java:S110")
+ @SuppressWarnings({"java:S110", "java:S115"})
public static class Builder extends WriterSerializerSession.Builder {
private JsonSerializer ctx;
@@ -61,7 +64,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(JsonSerializer ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
}
@@ -187,7 +190,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
* @return A new builder.
*/
public static Builder create(JsonSerializer ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private final JsonSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 2996e67d0a..5b400989fa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -45,8 +45,12 @@ import org.apache.juneau.serializer.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JsonSchemaDetails";>JSON-Schema
Support</a>
* </ul>
*/
+@SuppressWarnings("java:S115")
public class JsonSchemaGeneratorSession extends BeanTraverseSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
@@ -61,7 +65,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(JsonSchemaGenerator ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
}
@@ -139,7 +143,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
* @return A new builder.
*/
public static Builder create(JsonSchemaGenerator ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private final JsonSchemaGenerator ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
index 462e1e2eac..a3531a4175 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
@@ -47,8 +47,12 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/SerializersAndParsers";>Serializers
and Parsers</a>
* </ul>
*/
+@SuppressWarnings("java:S115")
public class OutputStreamSerializerSession extends SerializerSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
@@ -63,7 +67,7 @@ public class OutputStreamSerializerSession extends
SerializerSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(OutputStreamSerializer ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
}
@@ -171,7 +175,7 @@ public class OutputStreamSerializerSession extends
SerializerSession {
* @return A new builder.
*/
public static Builder create(OutputStreamSerializer ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private final OutputStreamSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index fd0a90dddf..e1616e409b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -62,8 +62,12 @@ import org.apache.juneau.swap.*;
* </ul>
*/
+@SuppressWarnings("java:S115")
public class SerializerSession extends BeanTraverseSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
@@ -82,7 +86,7 @@ public class SerializerSession extends BeanTraverseSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(Serializer ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
mediaTypeDefault(ctx.getResponseContentType());
uriContext = ctx.getUriContext();
@@ -244,7 +248,7 @@ public class SerializerSession extends BeanTraverseSession {
* @return A new builder.
*/
public static Builder create(Serializer ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
index 57d26d98c2..782a5a6218 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
@@ -50,8 +50,12 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/SerializersAndParsers";>Serializers
and Parsers</a>
* </ul>
*/
+@SuppressWarnings("java:S115")
public class WriterSerializerSession extends SerializerSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
@@ -69,7 +73,7 @@ public class WriterSerializerSession extends
SerializerSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(WriterSerializer ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
fileCharset = ctx.getFileCharset();
streamCharset = ctx.getStreamCharset();
@@ -243,7 +247,7 @@ public class WriterSerializerSession extends
SerializerSession {
* @return A new builder.
*/
public static Builder create(WriterSerializer ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private final WriterSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 5cf0ca197c..64f67b8ace 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -49,13 +49,16 @@ import org.apache.juneau.xml.annotation.*;
* </ul>
*/
-@SuppressWarnings({"unchecked","rawtypes","resource","java:S110"})
+@SuppressWarnings({"unchecked","rawtypes","resource","java:S110","java:S115"})
public class XmlSerializerSession extends WriterSerializerSession {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_ctx = "ctx";
+
/**
* Builder class.
*/
- @SuppressWarnings("java:S110")
+ @SuppressWarnings({"java:S110", "java:S115"})
public static class Builder extends WriterSerializerSession.Builder {
private XmlSerializer ctx;
@@ -67,7 +70,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
* <br>Cannot be <jk>null</jk>.
*/
protected Builder(XmlSerializer ctx) {
- super(assertArgNotNull("ctx", ctx));
+ super(assertArgNotNull(ARG_ctx, ctx));
this.ctx = ctx;
}
@@ -232,7 +235,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
* @return A new builder.
*/
public static Builder create(XmlSerializer ctx) {
- return new Builder(assertArgNotNull("ctx", ctx));
+ return new Builder(assertArgNotNull(ARG_ctx, ctx));
}
private final String textNodeDelimiter;
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 1f7beabef2..a82db921cd 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
@@ -1055,8 +1055,13 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
/**
* Builder class.
*/
+ @SuppressWarnings("java:S115")
public static class Builder extends BeanContextable.Builder {
+ // Argument name constants for assertArgNotNull
+ private static final String ARG_itcp = "itcp";
+ private static final String ARG_value = "value";
+
private BeanCreator<RestCallHandler> callHandler;
private BasicBeanStore beanStore =
BasicBeanStore.create().build();
private BiPredicate<RestRequest,RestResponse>
logRequestsPredicate;
@@ -1192,7 +1197,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @see
HttpClientBuilder#addInterceptorFirst(HttpRequestInterceptor)
*/
public Builder addInterceptorFirst(HttpRequestInterceptor itcp)
{
-
httpClientBuilder().addInterceptorFirst(assertArgNotNull("itcp", itcp));
+
httpClientBuilder().addInterceptorFirst(assertArgNotNull(ARG_itcp, itcp));
return this;
}
@@ -1209,7 +1214,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @see
HttpClientBuilder#addInterceptorFirst(HttpResponseInterceptor)
*/
public Builder addInterceptorFirst(HttpResponseInterceptor
itcp) {
-
httpClientBuilder().addInterceptorFirst(assertArgNotNull("itcp", itcp));
+
httpClientBuilder().addInterceptorFirst(assertArgNotNull(ARG_itcp, itcp));
return this;
}
@@ -1226,7 +1231,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @see
HttpClientBuilder#addInterceptorLast(HttpRequestInterceptor)
*/
public Builder addInterceptorLast(HttpRequestInterceptor itcp) {
-
httpClientBuilder().addInterceptorLast(assertArgNotNull("itcp", itcp));
+
httpClientBuilder().addInterceptorLast(assertArgNotNull(ARG_itcp, itcp));
return this;
}
@@ -1243,7 +1248,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @see
HttpClientBuilder#addInterceptorLast(HttpResponseInterceptor)
*/
public Builder addInterceptorLast(HttpResponseInterceptor itcp)
{
-
httpClientBuilder().addInterceptorLast(assertArgNotNull("itcp", itcp));
+
httpClientBuilder().addInterceptorLast(assertArgNotNull(ARG_itcp, itcp));
return this;
}
@@ -1578,7 +1583,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @see #callHandler()
*/
public Builder callHandler(Class<? extends RestCallHandler>
value) {
- callHandler().type(assertArgNotNull("value", value));
+ callHandler().type(assertArgNotNull(ARG_value, value));
return this;
}
@@ -2101,7 +2106,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder errorCodes(Predicate<Integer> value) {
- errorCodes = assertArgNotNull("value", value);
+ errorCodes = assertArgNotNull(ARG_value, value);
return this;
}
@@ -4053,7 +4058,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder partParser(Class<? extends HttpPartParser>
value) {
- partParser().type(assertArgNotNull("value", value));
+ partParser().type(assertArgNotNull(ARG_value, value));
return this;
}
@@ -4082,7 +4087,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder partParser(HttpPartParser value) {
- partParser().impl(assertArgNotNull("value", value));
+ partParser().impl(assertArgNotNull(ARG_value, value));
return this;
}
@@ -4122,7 +4127,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder partSerializer(Class<? extends
HttpPartSerializer> value) {
- partSerializer().type(assertArgNotNull("value", value));
+ partSerializer().type(assertArgNotNull(ARG_value,
value));
return this;
}
@@ -4151,7 +4156,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder partSerializer(HttpPartSerializer value) {
- partSerializer().impl(assertArgNotNull("value", value));
+ partSerializer().impl(assertArgNotNull(ARG_value,
value));
return this;
}
@@ -5633,7 +5638,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder uriContext(UriContext value) {
- serializers().forEach(x ->
x.uriContext(assertArgNotNull("value", value)));
+ serializers().forEach(x ->
x.uriContext(assertArgNotNull(ARG_value, value)));
return this;
}
@@ -5670,7 +5675,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder uriRelativity(UriRelativity value) {
- serializers().forEach(x ->
x.uriRelativity(assertArgNotNull("value", value)));
+ serializers().forEach(x ->
x.uriRelativity(assertArgNotNull(ARG_value, value)));
return this;
}
@@ -5709,7 +5714,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
public Builder uriResolution(UriResolution value) {
- serializers().forEach(x ->
x.uriResolution(assertArgNotNull("value", value)));
+ serializers().forEach(x ->
x.uriResolution(assertArgNotNull(ARG_value, value)));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
index 42344b793e..2fee4ddb82 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
@@ -63,7 +63,7 @@ public class RrpcRestOpSession extends RestOpSession {
* <br>Cannot be <jk>null</jk>.
*/
public Builder(RrpcRestOpContext ctx, RestSession session) {
- super(assertArgNotNull("ctx", ctx),
assertArgNotNull("session", session));
+ super(assertArgNotNull(ARG_ctx, ctx),
assertArgNotNull(ARG_session, session));
this.ctx = ctx;
}
