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 d62f002 Collections usage optimizations.
d62f002 is described below
commit d62f002703c787ff22680b1e71474b00f2fba05d
Author: JamesBognar <[email protected]>
AuthorDate: Sat Feb 19 13:23:08 2022 -0500
Collections usage optimizations.
---
.../apache/juneau/dto/jsonschema/JsonSchema.java | 5 +-
.../juneau/dto/jsonschema/JsonSchemaArray.java | 3 +-
.../juneau/dto/jsonschema/JsonTypeArray.java | 3 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 4 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 3 +-
.../src/main/java/org/apache/juneau/Context.java | 4 +-
.../org/apache/juneau/cp/DefaultClassList.java | 2 +-
.../org/apache/juneau/encoders/EncoderSet.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 2 +-
.../apache/juneau/internal/CollectionUtils.java | 69 +++++++++++++++++++++-
.../juneau/jsonschema/JsonSchemaGenerator.java | 16 ++---
.../java/org/apache/juneau/parser/ParserSet.java | 2 +-
.../apache/juneau/serializer/SerializerSet.java | 2 +-
.../java/org/apache/juneau/utils/SearchArgs.java | 2 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 4 +-
.../apache/juneau/microservice/Microservice.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 12 +---
.../java/org/apache/juneau/rest/RestOpContext.java | 20 ++-----
.../org/apache/juneau/rest/arg/RestOpArgList.java | 2 +-
.../rest/processor/ResponseProcessorList.java | 4 +-
.../apache/juneau/rest/staticfile/StaticFiles.java | 2 +-
23 files changed, 99 insertions(+), 70 deletions(-)
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index 1f064f1..f29b38e 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -1239,11 +1239,8 @@ public class JsonSchema {
* @return This object.
*/
public JsonSchema addAllOf(JsonSchema...allOf) {
- if (this.allOf == null)
- this.allOf = new LinkedList<>();
setMasterOn(allOf);
- for (JsonSchema s : allOf)
- this.allOf.add(s);
+ this.allOf = addAll(this.allOf, allOf);
return this;
}
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
index 1570bfd..5b1783b 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
@@ -49,8 +49,7 @@ public class JsonSchemaArray extends LinkedList<JsonSchema> {
* @return This object.
*/
public JsonSchemaArray addAll(JsonSchema...schemas) {
- for (JsonSchema s : schemas)
- add(s);
+ Collections.addAll(this, schemas);
return this;
}
}
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
index b739659..5a67b8b 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
@@ -49,8 +49,7 @@ public final class JsonTypeArray extends LinkedList<JsonType>
{
* @return This object.
*/
public JsonTypeArray addAll(JsonType...types) {
- for (JsonType t : types)
- add(t);
+ Collections.addAll(this, types);
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 61b83e5..f41a37b 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
@@ -1110,9 +1110,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfMetaProvider {
*/
@FluentSetter
public Builder namespaces(Namespace...values) {
- if (namespaces == null)
- namespaces = list();
- Collections.addAll(namespaces, values);
+ namespaces = addAll(namespaces, values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 61574c4..b14e0e0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -528,8 +528,7 @@ public final class ClassMeta<T> implements Type {
BeanFilter beanFilter = findBeanFilter(bc);
MarshalledFilter marshalledFilter =
findMarshalledFilter(bc);
- if (swaps != null)
- addAll(this.swaps, swaps);
+ addAll(this.swaps, swaps);
if (bc != null)
this.builderSwap =
BuilderSwap.findSwapFromObjectClass(bc, c, bc.getBeanConstructorVisibility(),
bc.getBeanMethodVisibility());
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 1fae783..b14babf 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
@@ -696,9 +696,7 @@ public abstract class Context implements AnnotationProvider
{
*/
@FluentSetter
public Builder annotations(Annotation...values) {
- if (annotations == null)
- annotations = list();
- Collections.addAll(annotations, values);
+ annotations = addAll(annotations, values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
index 6a2682e..70949d0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
@@ -82,7 +82,7 @@ public class DefaultClassList {
* @return This object.
*/
public DefaultClassList add(Class<?>...values) {
- entries.addAll(0, alist(values));
+ prependAll(entries, values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index 472b431..d90cf7d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -225,7 +225,7 @@ public final class EncoderSet {
* @return This object.
*/
public Builder add(Encoder...values) {
- entries.addAll(0, alist(values));
+ prependAll(entries, (Object[])values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 95b96bd..eed7996 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -787,7 +787,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
@FluentSetter
@SuppressWarnings("unchecked")
public Builder widgets(Class<? extends HtmlWidget>...values) {
- Collections.addAll(widgets(), values);
+ addAll(widgets(), values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
index f5f2687..013458f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -478,7 +478,7 @@ public class HeaderList {
@FluentSetter
public Builder prepend(HeaderList value) {
if (value != null)
- entries.addAll(0, alist(value.entries));
+ prependAll(entries, value.entries);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
index ea8b1cd..b5ec031 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -465,7 +465,7 @@ public class PartList {
@FluentSetter
public Builder prepend(PartList value) {
if (value != null)
- entries.addAll(0, alist(value.entries));
+ prependAll(entries, value.entries);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
index f552407..60083b8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
@@ -526,13 +526,78 @@ public final class CollectionUtils {
/**
* Adds all the specified values to the specified collection.
+ * Creates a new set if the value is <jk>null</jk>.
*
* @param value The collection to add to.
* @param entries The entries to add.
+ * @return The set.
*/
@SafeVarargs
- public static <T> void addAll(Collection<T> value, T...entries) {
- Collections.addAll(value, entries);
+ public static <T> Set<T> addAll(Set<T> value, T...entries) {
+ if (entries != null) {
+ if (value == null)
+ value = set(entries);
+ else
+ Collections.addAll(value, entries);
+ }
+ return value;
+ }
+
+ /**
+ * Adds all the specified values to the specified collection.
+ * Creates a new set if the value is <jk>null</jk>.
+ *
+ * @param value The collection to add to.
+ * @param entries The entries to add.
+ * @return The set.
+ */
+ @SafeVarargs
+ public static <T> SortedSet<T> addAll(SortedSet<T> value, T...entries) {
+ if (entries != null) {
+ if (value == null)
+ value = sortedSet(entries);
+ else
+ Collections.addAll(value, entries);
+ }
+ return value;
+ }
+
+ /**
+ * Adds all the specified values to the specified collection.
+ * Creates a new set if the value is <jk>null</jk>.
+ *
+ * @param value The collection to add to.
+ * @param entries The entries to add.
+ * @return The set.
+ */
+ @SafeVarargs
+ public static <T> List<T> addAll(List<T> value, T...entries) {
+ if (entries != null) {
+ if (value == null)
+ value = list(entries);
+ else
+ Collections.addAll(value, entries);
+ }
+ return value;
+ }
+
+ /**
+ * Adds all the specified values to the specified collection.
+ * Creates a new set if the value is <jk>null</jk>.
+ *
+ * @param value The collection to add to.
+ * @param entries The entries to add.
+ * @return The set.
+ */
+ @SafeVarargs
+ public static <T> List<T> prependAll(List<T> value, T...entries) {
+ if (entries != null) {
+ if (value == null)
+ value = list(entries);
+ else
+ value.addAll(0, alist(entries));
+ }
+ return value;
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 69a8089..19ff7d6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -78,10 +78,10 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
final JsonSerializer.Builder jsonSerializerBuilder;
final JsonParser.Builder jsonParserBuilder;
- Set<TypeCategory> addDescriptionsTo, addExamplesTo;
+ SortedSet<TypeCategory> addDescriptionsTo, addExamplesTo;
boolean allowNestedDescriptions, allowNestedExamples,
useBeanDefs;
Class<? extends BeanDefMapper> beanDefMapper;
- Set<String> ignoreTypes;
+ SortedSet<String> ignoreTypes;
/**
* Constructor, default settings.
@@ -198,9 +198,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
*/
@FluentSetter
public Builder addDescriptionsTo(TypeCategory...values) {
- if (addDescriptionsTo == null)
- addDescriptionsTo = new TreeSet<>();
- Collections.addAll(addDescriptionsTo, values);
+ addDescriptionsTo = addAll(addDescriptionsTo, values);
return this;
}
@@ -239,9 +237,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
*/
@FluentSetter
public Builder addExamplesTo(TypeCategory...values) {
- if (addExamplesTo == null)
- addExamplesTo = new TreeSet<>();
- Collections.addAll(addExamplesTo, values);
+ addExamplesTo = addAll(addExamplesTo, values);
return this;
}
@@ -339,9 +335,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
*/
@FluentSetter
public Builder ignoreTypes(String...values) {
- if (ignoreTypes == null)
- ignoreTypes = new TreeSet<>();
- Collections.addAll(ignoreTypes, values);
+ ignoreTypes = addAll(ignoreTypes, values);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 49c6db6..20d3125 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -345,7 +345,7 @@ public final class ParserSet {
* @return This object.
*/
public Builder add(Parser...s) {
- entries.addAll(0, alist(s));
+ prependAll(entries, (Object[])s);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index 0ae459f..a861b6d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -341,7 +341,7 @@ public final class SerializerSet {
* @return This object.
*/
public Builder add(Serializer...s) {
- entries.addAll(0, alist(s));
+ prependAll(entries, (Object[])s);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
index c7d560d..2f01a40 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
@@ -142,7 +142,7 @@ public class SearchArgs {
*/
public Builder view(String columns) {
if (columns != null)
- Collections.addAll(this.view,
StringUtils.split(columns));
+ addAll(this.view, StringUtils.split(columns));
return this;
}
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 e6f0b7b..29f8ee5 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
@@ -510,9 +510,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
*/
@FluentSetter
public Builder namespaces(Namespace...values) {
- if (namespaces == null)
- namespaces = list();
- Collections.addAll(namespaces, values);
+ namespaces = addAll(namespaces, values);
return this;
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index 72fa903..a826cf6 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -435,7 +435,7 @@ public class Microservice implements ConfigEventListener {
* @return This object.
*/
public Builder
consoleCommands(ConsoleCommand...consoleCommands) {
- Collections.addAll(this.consoleCommands,
consoleCommands);
+ addAll(this.consoleCommands, consoleCommands);
return this;
}
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 814d084..4fb8d95 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
@@ -5209,7 +5209,7 @@ public class RestContext extends Context {
*/
@FluentSetter
public Builder children(Object...values) {
- children.addAll(alist(values));
+ addAll(children, values);
return this;
}
@@ -5562,10 +5562,7 @@ public class RestContext extends Context {
*/
@FluentSetter
public Builder produces(MediaType...values) {
- if (produces == null)
- produces = list(values);
- else
- produces.addAll(alist(values));
+ produces = addAll(produces, values);
return this;
}
@@ -5625,10 +5622,7 @@ public class RestContext extends Context {
*/
@FluentSetter
public Builder consumes(MediaType...values) {
- if (consumes == null)
- consumes = list(values);
- else
- consumes.addAll(alist(values));
+ consumes = addAll(consumes, values);
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 e45525d..42fda24 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
@@ -1957,10 +1957,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@FluentSetter
public Builder path(String...values) {
- if (path == null)
- path = list(values);
- else
- path.addAll(0, alist(values));
+ path = prependAll(path, values);
return this;
}
@@ -1992,10 +1989,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@FluentSetter
public Builder produces(MediaType...values) {
- if (produces == null)
- produces = list(values);
- else
- produces.addAll(alist(values));
+ produces = addAll(produces, values);
return this;
}
@@ -2028,10 +2022,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@FluentSetter
public Builder rolesDeclared(String...values) {
- if (rolesDeclared == null)
- rolesDeclared = set(values);
- else
- rolesDeclared.addAll(alist(values));
+ rolesDeclared = addAll(rolesDeclared, values);
return this;
}
@@ -2116,10 +2107,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
@FluentSetter
public Builder consumes(MediaType...values) {
- if (consumes == null)
- consumes = list(values);
- else
- consumes.addAll(alist(values));
+ consumes = addAll(consumes, values);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
index 51b745f..cdd5718 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
@@ -84,7 +84,7 @@ public class RestOpArgList {
* @throws IllegalArgumentException if any class does not
extend from {@link RestOpArg}.
*/
public Builder add(Class<?>...values) {
- entries.addAll(0,
alist(assertClassArrayArgIsType("values", RestOpArg.class, values)));
+ prependAll(entries, assertClassArrayArgIsType("values",
RestOpArg.class, values));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
index 26b8539..b9d5a95 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
@@ -84,7 +84,7 @@ public class ResponseProcessorList {
* @throws IllegalArgumentException if any class does not
extend from {@link ResponseProcessor}.
*/
public Builder add(Class<?>...values) {
-
entries.addAll(alist(assertClassArrayArgIsType("values",
ResponseProcessor.class, values)));
+ addAll(entries,
(Object[])assertClassArrayArgIsType("values", ResponseProcessor.class, values));
return this;
}
@@ -95,7 +95,7 @@ public class ResponseProcessorList {
* @return This object.
*/
public Builder add(ResponseProcessor...values) {
- entries.addAll(alist(values));
+ addAll(entries, (Object[])values);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
index ff4d7f2..eed4000 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
@@ -99,7 +99,7 @@ public interface StaticFiles extends FileFinder {
*/
@FluentSetter
public Builder headers(Header...headers) {
- this.headers.addAll(alist(headers));
+ addAll(this.headers, headers);
return this;
}
