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 25d8c3c Improvements to PropertyStoreBuilder.
25d8c3c is described below
commit 25d8c3cff62b57ccdb5af2df5e06623751535f6b
Author: JamesBognar <[email protected]>
AuthorDate: Sun Mar 29 10:17:32 2020 -0400
Improvements to PropertyStoreBuilder.
---
.../org/apache/juneau/config/ConfigBuilder.java | 12 ++
.../config/store/ConfigClasspathStoreBuilder.java | 12 ++
.../config/store/ConfigFileStoreBuilder.java | 12 ++
.../config/store/ConfigMemoryStoreBuilder.java | 12 ++
.../juneau/config/store/ConfigStoreBuilder.java | 12 ++
.../java/org/apache/juneau/PropertyStoreTest.java | 12 +-
.../org/apache/juneau/jena/RdfParserBuilder.java | 12 ++
.../apache/juneau/jena/RdfSerializerBuilder.java | 12 ++
.../java/org/apache/juneau/BeanContextBuilder.java | 18 ++-
.../org/apache/juneau/BeanTraverseBuilder.java | 12 ++
.../java/org/apache/juneau/ContextBuilder.java | 5 +-
.../org/apache/juneau/PropertyStoreBuilder.java | 126 ++++++---------------
.../apache/juneau/annotation/BeanConfigApply.java | 2 +-
.../org/apache/juneau/csv/CsvParserBuilder.java | 12 ++
.../apache/juneau/csv/CsvSerializerBuilder.java | 12 ++
.../juneau/html/HtmlDocSerializerBuilder.java | 12 ++
.../org/apache/juneau/html/HtmlParserBuilder.java | 12 ++
.../juneau/html/HtmlSchemaSerializerBuilder.java | 18 ++-
.../apache/juneau/html/HtmlSerializerBuilder.java | 12 ++
.../html/HtmlStrippedDocSerializerBuilder.java | 12 ++
.../org/apache/juneau/jso/JsoParserBuilder.java | 12 ++
.../apache/juneau/jso/JsoSerializerBuilder.java | 12 ++
.../org/apache/juneau/json/JsonParserBuilder.java | 12 ++
.../apache/juneau/json/JsonSerializerBuilder.java | 12 ++
.../juneau/json/SimpleJsonParserBuilder.java | 12 ++
.../juneau/json/SimpleJsonSerializerBuilder.java | 12 ++
.../jsonschema/JsonSchemaGeneratorBuilder.java | 18 ++-
.../juneau/msgpack/MsgPackParserBuilder.java | 12 ++
.../juneau/msgpack/MsgPackSerializerBuilder.java | 12 ++
.../apache/juneau/oapi/OpenApiParserBuilder.java | 12 ++
.../juneau/oapi/OpenApiSerializerBuilder.java | 12 ++
.../juneau/parser/InputStreamParserBuilder.java | 12 ++
.../org/apache/juneau/parser/ParserBuilder.java | 12 ++
.../apache/juneau/parser/ParserGroupBuilder.java | 12 ++
.../apache/juneau/parser/ReaderParserBuilder.java | 12 ++
.../juneau/plaintext/PlainTextParserBuilder.java | 12 ++
.../plaintext/PlainTextSerializerBuilder.java | 12 ++
.../serializer/OutputStreamSerializerBuilder.java | 12 ++
.../juneau/serializer/SerializerBuilder.java | 12 ++
.../juneau/serializer/SerializerGroupBuilder.java | 12 ++
.../juneau/serializer/WriterSerializerBuilder.java | 12 ++
.../juneau/soap/SoapXmlSerializerBuilder.java | 12 ++
.../org/apache/juneau/uon/UonParserBuilder.java | 12 ++
.../apache/juneau/uon/UonSerializerBuilder.java | 12 ++
.../urlencoding/UrlEncodingParserBuilder.java | 12 ++
.../urlencoding/UrlEncodingSerializerBuilder.java | 12 ++
.../org/apache/juneau/xml/XmlParserBuilder.java | 12 ++
.../apache/juneau/xml/XmlSerializerBuilder.java | 12 ++
.../main/ConfigurablePropertyCodeGenerator.java | 9 ++
.../juneau/rest/client2/RestClientBuilder.java | 12 ++
.../apache/juneau/rest/mock2/MockRestClient.java | 12 ++
.../org/apache/juneau/rest/RestContextBuilder.java | 30 ++---
.../rest/annotation/RestMethodConfigApply.java | 6 +-
53 files changed, 624 insertions(+), 136 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
index e5a753a..9ce13af 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
@@ -345,6 +345,18 @@ public class ConfigBuilder extends ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
index da2e6da..fbbd444 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
@@ -100,6 +100,18 @@ public class ConfigClasspathStoreBuilder extends
ConfigStoreBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigClasspathStoreBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigClasspathStoreBuilder putTo(String name, String key,
Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigClasspathStoreBuilder removeFrom(String name, Object
value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
index 3087141..49276c1 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
@@ -274,6 +274,18 @@ public class ConfigFileStoreBuilder extends
ConfigStoreBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigFileStoreBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigFileStoreBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigFileStoreBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
index 37c7952..df0ae7f 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
@@ -100,6 +100,18 @@ public class ConfigMemoryStoreBuilder extends
ConfigStoreBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigMemoryStoreBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigMemoryStoreBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigMemoryStoreBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
index 76be281..549415b 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
@@ -98,6 +98,18 @@ public abstract class ConfigStoreBuilder extends
ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigStoreBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigStoreBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigStoreBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
index 8ed9cb0..6b80363 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
@@ -1659,22 +1659,22 @@ public class PropertyStoreTest {
public void testAddToInvalidObjectMap() {
PropertyStoreBuilder b = PropertyStore.create();
try {
- b.putTo("A.foo.sms", "{xxx}");
+ b.putAllTo("A.foo.sms", "{xxx}");
fail("Exception expected.");
} catch (ConfigException e) {
- assertTrue(e.getMessage().startsWith("Cannot add
'{xxx}' (String) to property 'foo.sms' (Map<String,String>)."));
+ assertTrue(e.getMessage().startsWith("Cannot put
'{xxx}' (String) to property 'foo.sms' (Map<String,String>)."));
}
try {
- b.putTo("A.foo.sms", "xxx");
+ b.putAllTo("A.foo.sms", "xxx");
fail("Exception expected.");
} catch (ConfigException e) {
- assertEquals("Cannot add 'xxx' (String) to property
'foo.sms' (Map<String,String>).", e.getMessage());
+ assertEquals("Cannot put 'xxx' (String) to property
'foo.sms' (Map<String,String>).", e.getMessage());
}
try {
- b.putTo("A.foo.sms", new StringBuilder("foo"));
+ b.putAllTo("A.foo.sms", new StringBuilder("foo"));
fail("Exception expected.");
} catch (ConfigException e) {
- assertEquals("Cannot add 'foo' (StringBuilder) to
property 'foo.sms' (Map<String,String>).", e.getMessage());
+ assertEquals("Cannot put 'foo' (StringBuilder) to
property 'foo.sms' (Map<String,String>).", e.getMessage());
}
}
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index c598906..6702c9a 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -823,6 +823,18 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public RdfParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public RdfParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public RdfParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index cb9c2c2..fcedc7a 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -983,6 +983,18 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public RdfSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public RdfSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public RdfSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 061bb92..6dc7f7d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -2230,12 +2230,6 @@ public class BeanContextBuilder extends ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
- public BeanContextBuilder putTo(String name, String key, Object value) {
- super.putTo(name, key, value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
public BeanContextBuilder appendTo(String name, Object value) {
super.appendTo(name, value);
return this;
@@ -2272,6 +2266,18 @@ public class BeanContextBuilder extends ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public BeanContextBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public BeanContextBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public BeanContextBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
index 62afcf7..6330c07 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
@@ -226,6 +226,18 @@ public class BeanTraverseBuilder extends
BeanContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public BeanTraverseBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public BeanTraverseBuilder putTo(String name, String key, Object value)
{
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public BeanTraverseBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
index 4821b83..c69a5be 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
@@ -359,8 +359,9 @@ public abstract class ContextBuilder {
* @return This object (for method chaining).
* @throws ConfigException If property is not a MAP property.
*/
- public ContextBuilder putTo(String name, Object value) {
- psb.putTo(name, value);
+ @ConfigurationProperty
+ public ContextBuilder putAllTo(String name, Object value) {
+ psb.putAllTo(name, value);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
index 35aeee5..34bde57 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
@@ -156,8 +156,11 @@ public class PropertyStoreBuilder {
if ("add".equals(command))
return addTo(key2, value);
- if ("put".equals(command))
+ if ("put".equals(command)) {
+ if (arg == null)
+ return putAllTo(key2, value);
return putTo(key2, arg, value);
+ }
if ("append".equals(command))
return appendTo(key2, value);
if ("prepend".equals(command))
@@ -265,7 +268,7 @@ public class PropertyStoreBuilder {
groups.put(g, gb);
}
- gb.addTo(n, value);
+ gb.addToSet(n, value);
if (gb.isEmpty())
groups.remove(g);
@@ -296,7 +299,7 @@ public class PropertyStoreBuilder {
groups.put(g, gb);
}
- gb.putTo(n, mapKey, value);
+ gb.putToMap(n, mapKey, value);
if (gb.isEmpty())
groups.remove(g);
@@ -312,7 +315,7 @@ public class PropertyStoreBuilder {
* @return This object (for method chaining).
* @throws ConfigException If property is not a SET property, or the
argument is invalid.
*/
- public synchronized PropertyStoreBuilder putTo(String key, Object
value) {
+ public synchronized PropertyStoreBuilder putAllTo(String key, Object
value) {
propertyStore = null;
String g = group(key);
String n = g.isEmpty() ? key : key.substring(g.length()+1);
@@ -326,7 +329,7 @@ public class PropertyStoreBuilder {
groups.put(g, gb);
}
- gb.putTo(n, value);
+ gb.putAllToMap(n, value);
if (gb.isEmpty())
groups.remove(g);
@@ -359,7 +362,7 @@ public class PropertyStoreBuilder {
groups.put(g, gb);
}
- gb.appendTo(n, value);
+ gb.appendToList(n, value);
if (gb.isEmpty())
groups.remove(g);
@@ -534,15 +537,15 @@ public class PropertyStoreBuilder {
}
}
- synchronized void addTo(String key, Object value) {
+ synchronized void addToSet(String key, Object value) {
MutableProperty p = properties.get(key);
if (p == null) {
p = MutableProperty.create(key, null);
- p.add(null, value);
+ p.add(value);
if (! p.isEmpty())
properties.put(key, p);
} else {
- p.add(null, value);
+ p.add(value);
if (p.isEmpty())
properties.remove(key);
else
@@ -550,15 +553,15 @@ public class PropertyStoreBuilder {
}
}
- synchronized void putTo(String key, String arg, Object value) {
+ synchronized void putToMap(String key, String arg, Object
value) {
MutableProperty p = properties.get(key);
if (p == null) {
p = MutableProperty.create(key, null);
- p.add(arg, value);
+ p.put(arg, value);
if (! p.isEmpty())
properties.put(key, p);
} else {
- p.add(arg, value);
+ p.put(arg, value);
if (p.isEmpty())
properties.remove(key);
else
@@ -566,7 +569,7 @@ public class PropertyStoreBuilder {
}
}
- synchronized void putTo(String key, Object value) {
+ synchronized void putAllToMap(String key, Object value) {
MutableProperty p = properties.get(key);
if (p == null) {
p = MutableProperty.create(key, null);
@@ -582,7 +585,7 @@ public class PropertyStoreBuilder {
}
}
- synchronized void appendTo(String key, Object value) {
+ synchronized void appendToList(String key, Object value) {
MutableProperty p = properties.get(key);
if (p == null) {
p = MutableProperty.create(key, null);
@@ -709,11 +712,11 @@ public class PropertyStoreBuilder {
abstract Object peek();
- void add(String arg, Object value) {
+ void add(Object value) {
throw new ConfigException("Cannot add value {0} ({1})
to property ''{2}'' ({3}).", string(value), className(value), name, type);
}
- void put(String arg, String key, Object value) {
+ void put(String key, Object value) {
throw new ConfigException("Cannot put all value {0}
({1}) to property ''{2}'' ({3}).", string(value), className(value), name, type);
}
@@ -816,9 +819,7 @@ public class PropertyStoreBuilder {
}
@Override /* MutableProperty */
- synchronized void add(String arg, Object o) {
- if (arg != null)
- throw new ConfigException("Cannot use argument
''{0}'' on add command for property ''{1}'' ({2})", arg, name, type);
+ synchronized void add(Object o) {
try {
set.addAll(normalize(type.converter, o));
} catch (Exception e) {
@@ -827,27 +828,6 @@ public class PropertyStoreBuilder {
}
@Override /* MutableProperty */
- synchronized void append(Object o) {
- try {
- set.addAll(normalize(type.converter, o));
- } catch (Exception e) {
- throw new ConfigException(e, "Cannot append
value {0} ({1}) to property ''{2}'' ({3}).", string(o), className(o), name,
type);
- }
- }
-
- @Override /* MutableProperty */
- synchronized void prepend(Object o) {
- try {
- Set<Object> s = new LinkedHashSet<>(set);
- set.clear();
- set.addAll(normalize(type.converter, o));
- set.addAll(s);
- } catch (Exception e) {
- throw new ConfigException(e, "Cannot prepend
value {0} ({1}) to property ''{2}'' ({3}).", string(o), className(o), name,
type);
- }
- }
-
- @Override /* MutableProperty */
synchronized void remove(Object o) {
try {
set.removeAll(normalize(type.converter, o));
@@ -901,26 +881,6 @@ public class PropertyStoreBuilder {
}
@Override /* MutableProperty */
- synchronized void add(String arg, Object o) {
- if (arg != null && ! StringUtils.isNumeric(arg))
- throw new ConfigException("Invalid argument
''{0}'' on add command for property ''{1}'' ({2})", arg, name, type);
-
- int index = arg == null ? 0 : Integer.parseInt(arg);
- if (index < 0)
- index = 0;
- else if (index > list.size())
- index = list.size();
-
- try {
- List<Object> l = normalize(type.converter, o);
- list.removeAll(l);
- list.addAll(index, l);
- } catch (Exception e) {
- throw new ConfigException(e, "Cannot add value
{0} ({1}) to property ''{2}'' ({3}).", string(o), className(o), name, type);
- }
- }
-
- @Override /* MutableProperty */
synchronized void append(Object o) {
try {
List<Object> l = normalize(type.converter, o);
@@ -988,41 +948,25 @@ public class PropertyStoreBuilder {
@Override /* MutableProperty */
synchronized void set(Object value) {
this.map.clear();
- add(null, value);
+ putAll(value);
}
@SuppressWarnings("unchecked")
@Override /* MutableProperty */
synchronized void apply(Object values) {
for (Map.Entry<String,Object> e :
((Map<String,Object>)values).entrySet())
- add(e.getKey(), e.getValue());
+ put(e.getKey(), e.getValue());
}
@Override /* MutableProperty */
- synchronized void add(String arg, Object o) {
- if (arg != null) {
- o = convert(o);
- if (o == null)
- this.map.remove(arg);
- else
- this.map.put(arg, o);
-
- } else if (o != null) {
- if (o instanceof Map) {
- Map m = (Map)o;
- for (Map.Entry e :
(Set<Map.Entry>)m.entrySet())
- if (e.getKey() != null)
-
add(e.getKey().toString(), e.getValue());
- } else if (isObjectMap(o)) {
- try {
- add(null, new
ObjectMap(o.toString()));
- } catch (Exception e) {
- throw new ConfigException(e,
"Cannot add {0} ({1}) to property ''{2}'' ({3}).", string(o), className(o),
name, type);
- }
- } else {
- throw new ConfigException("Cannot add
{0} ({1}) to property ''{2}'' ({3}).", string(o), className(o), name, type);
- }
- }
+ synchronized void put(String key, Object o) {
+ if (key == null)
+ return;
+ o = convert(o);
+ if (o == null)
+ this.map.remove(key);
+ else
+ this.map.put(key, o);
}
@Override /* MutableProperty */
@@ -1031,15 +975,15 @@ public class PropertyStoreBuilder {
Map m = (Map)o;
for (Map.Entry e : (Set<Map.Entry>)m.entrySet())
if (e.getKey() != null)
- add(e.getKey().toString(),
e.getValue());
+ put(e.getKey().toString(),
e.getValue());
} else if (isObjectMap(o)) {
try {
- add(null, new ObjectMap(o.toString()));
+ putAll(new ObjectMap(o.toString()));
} catch (Exception e) {
- throw new ConfigException(e, "Cannot
add {0} ({1}) to property ''{2}'' ({3}).", string(o), className(o), name, type);
+ throw new ConfigException(e, "Cannot
put {0} ({1}) to property ''{2}'' ({3}).", string(o), className(o), name, type);
}
- } else {
- throw new ConfigException("Cannot add {0} ({1})
to property ''{2}'' ({3}).", string(o), className(o), name, type);
+ } else if (o != null) {
+ throw new ConfigException("Cannot put {0} ({1})
to property ''{2}'' ({3}).", string(o), className(o), name, type);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
index 71420c5..5a6511e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
@@ -92,7 +92,7 @@ public class BeanConfigApply extends ConfigApply<BeanConfig> {
for (CS e : a.example())
psb.putTo(BEAN_examples, e.k().getName(), parse(e.k(),
e.v(), "example"));
if (a.examples().length > 0)
- psb.putTo(BEAN_examples, objectMap(a.examples(),
"examples"));
+ psb.putAllTo(BEAN_examples, objectMap(a.examples(),
"examples"));
if (! a.fluentSetters().isEmpty())
psb.set(BEAN_fluentSetters, bool(a.fluentSetters()));
if (! a.ignoreInvocationExceptionsOnGetters().isEmpty())
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
index 42d34d9..17b5bc4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
@@ -104,6 +104,18 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public CsvParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public CsvParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public CsvParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index 117f6d9..da5c437 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
@@ -104,6 +104,18 @@ public class CsvSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public CsvSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public CsvSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public CsvSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
index 44414a7..90d7708 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
@@ -630,6 +630,18 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlDocSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlDocSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlDocSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
index acd04f8..e933257 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
@@ -107,6 +107,18 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
index a04a25b..3a6d5b0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
@@ -308,12 +308,6 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
- public HtmlSchemaSerializerBuilder putTo(String name, String key,
Object value) {
- super.putTo(name, key, value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
public HtmlSchemaSerializerBuilder appendTo(String name, Object value) {
super.appendTo(name, value);
return this;
@@ -350,6 +344,18 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlSchemaSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlSchemaSerializerBuilder putTo(String name, String key,
Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlSchemaSerializerBuilder removeFrom(String name, Object
value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index 00cee4e..4338bb7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -278,6 +278,18 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
index 699423a..0e3d93b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
@@ -104,6 +104,18 @@ public class HtmlStrippedDocSerializerBuilder extends
HtmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlStrippedDocSerializerBuilder putAllTo(String name, Object
value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlStrippedDocSerializerBuilder putTo(String name, String key,
Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlStrippedDocSerializerBuilder removeFrom(String name, Object
value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
index f732727..6504a45 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
@@ -103,6 +103,18 @@ public class JsoParserBuilder extends
InputStreamParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsoParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public JsoParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsoParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
index d2ec04c..127e699 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
@@ -103,6 +103,18 @@ public class JsoSerializerBuilder extends
OutputStreamSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsoSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public JsoSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsoSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
index b84a126..359a6f9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
@@ -145,6 +145,18 @@ public class JsonParserBuilder extends ReaderParserBuilder
{
}
@Override /* GENERATED - ContextBuilder */
+ public JsonParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public JsonParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 6e4a53f..c84fb11 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
@@ -200,6 +200,18 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsonSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public JsonSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
index 617a6f3..946ee68 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
@@ -103,6 +103,18 @@ public class SimpleJsonParserBuilder extends
JsonParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SimpleJsonParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public SimpleJsonParserBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SimpleJsonParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
index ade0567..4f39417 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
@@ -103,6 +103,18 @@ public class SimpleJsonSerializerBuilder extends
JsonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SimpleJsonSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public SimpleJsonSerializerBuilder putTo(String name, String key,
Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SimpleJsonSerializerBuilder removeFrom(String name, Object
value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
index f83033e..9032539 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
@@ -342,12 +342,6 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
}
@Override /* GENERATED - ContextBuilder */
- public JsonSchemaGeneratorBuilder putTo(String name, String key, Object
value) {
- super.putTo(name, key, value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
public JsonSchemaGeneratorBuilder appendTo(String name, Object value) {
super.appendTo(name, value);
return this;
@@ -384,6 +378,18 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsonSchemaGeneratorBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public JsonSchemaGeneratorBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonSchemaGeneratorBuilder removeFrom(String name, Object value)
{
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
index a292d97..d0fbb17 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
@@ -103,6 +103,18 @@ public class MsgPackParserBuilder extends
InputStreamParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public MsgPackParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public MsgPackParserBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public MsgPackParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
index b147d2d..17a79ec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
@@ -103,6 +103,18 @@ public class MsgPackSerializerBuilder extends
OutputStreamSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public MsgPackSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public MsgPackSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public MsgPackSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
index 01886e5..e7143b9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
@@ -104,6 +104,18 @@ public class OpenApiParserBuilder extends UonParserBuilder
{
}
@Override /* GENERATED - ContextBuilder */
+ public OpenApiParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public OpenApiParserBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public OpenApiParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
index 4f32187..fab35d1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
@@ -104,6 +104,18 @@ public class OpenApiSerializerBuilder extends
UonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public OpenApiSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public OpenApiSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public OpenApiSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
index 1fc9729..c77e640 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
@@ -142,6 +142,18 @@ public class InputStreamParserBuilder extends
ParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public InputStreamParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public InputStreamParserBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public InputStreamParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
index 000b313..8cb78a1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
@@ -289,6 +289,18 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
index 7d86352..9f372f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
@@ -421,6 +421,18 @@ public class ParserGroupBuilder extends BeanContextBuilder
{
}
@Override /* GENERATED - ContextBuilder */
+ public ParserGroupBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ParserGroupBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ParserGroupBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
index 9bfc803..821eb12 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
@@ -141,6 +141,18 @@ public abstract class ReaderParserBuilder extends
ParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ReaderParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public ReaderParserBuilder putTo(String name, String key, Object value)
{
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ReaderParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
index 98621b4..8eec34e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
@@ -104,6 +104,18 @@ public class PlainTextParserBuilder extends
ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public PlainTextParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public PlainTextParserBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public PlainTextParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
index 100b93c..e360e5f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
@@ -104,6 +104,18 @@ public class PlainTextSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public PlainTextSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public PlainTextSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public PlainTextSerializerBuilder removeFrom(String name, Object value)
{
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
index b41e565..7783027 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
@@ -142,6 +142,18 @@ public class OutputStreamSerializerBuilder extends
SerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public OutputStreamSerializerBuilder putAllTo(String name, Object
value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public OutputStreamSerializerBuilder putTo(String name, String key,
Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public OutputStreamSerializerBuilder removeFrom(String name, Object
value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
index f43402c..9f0b9db 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
@@ -557,6 +557,18 @@ public class SerializerBuilder extends BeanTraverseBuilder
{
}
@Override /* GENERATED - ContextBuilder */
+ public SerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public SerializerBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
index c6639e8..ef91bb1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
@@ -690,6 +690,18 @@ public class SerializerGroupBuilder extends
BeanTraverseBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SerializerGroupBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public SerializerGroupBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SerializerGroupBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
index 8e4f9db..a957233 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
@@ -257,6 +257,18 @@ public class WriterSerializerBuilder extends
SerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public WriterSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public WriterSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public WriterSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
index 1009076..b5b6be3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -124,6 +124,18 @@ public class SoapXmlSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SoapXmlSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public SoapXmlSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SoapXmlSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
index d069d10..6d9bf8c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
@@ -184,6 +184,18 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UonParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public UonParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UonParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
index 09dde64..6444d0f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
@@ -201,6 +201,18 @@ public class UonSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UonSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public UonSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UonSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
index 778b51e..9fbcc06 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
@@ -144,6 +144,18 @@ public class UrlEncodingParserBuilder extends
UonParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UrlEncodingParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public UrlEncodingParserBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UrlEncodingParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index b972765..1d7ea35 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -145,6 +145,18 @@ public class UrlEncodingSerializerBuilder extends
UonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UrlEncodingSerializerBuilder putAllTo(String name, Object value)
{
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public UrlEncodingSerializerBuilder putTo(String name, String key,
Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UrlEncodingSerializerBuilder removeFrom(String name, Object
value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
index d0443d6..977e6c0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
@@ -293,6 +293,18 @@ public class XmlParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public XmlParserBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public XmlParserBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public XmlParserBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index a974f53..fddd963 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
@@ -335,6 +335,18 @@ public class XmlSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public XmlSerializerBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public XmlSerializerBuilder putTo(String name, String key, Object
value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public XmlSerializerBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
b/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
index 7e9d1ee..24ae0ab 100644
---
a/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
+++
b/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
@@ -196,6 +196,15 @@ public class ConfigurablePropertyCodeGenerator {
.append("@Override /* GENERATED - ").append(pcc.getSimpleName()).append(" */")
;
+ if (m.isVarArgs()) {
+ Type t =
m.getParameters()[m.getParameterCount()-1].getParameterizedType();
+ if
(t.toString().contains(" extends ")) {
+
sb.append("\n\t")
+
.append("@SuppressWarnings(\"unchecked\")");
+ ;
+ }
+ }
+
// Line 2
sb.append("\n\tpublic
");
if
(m.getTypeParameters().length > 0)
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
index 15be8f8..87aaedc 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
@@ -2836,6 +2836,18 @@ public class RestClientBuilder extends
BeanContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public RestClientBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public RestClientBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public RestClientBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
index eefc2f1..6ca8809 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
@@ -182,6 +182,18 @@ public class MockRestClient extends RestClientBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public MockRestClient putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public MockRestClient putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public MockRestClient removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 5b29aa7..0fcc1ed 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -1957,7 +1957,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*/
@ConfigurationProperty
public RestContextBuilder staticFileResponseHeaders(Map<String,String>
headers) {
- return putTo(REST_staticFileResponseHeaders, headers);
+ return putAllTo(REST_staticFileResponseHeaders, headers);
}
/**
@@ -2316,7 +2316,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*/
@ConfigurationProperty
public RestContextBuilder properties(Map<String,Object> values) {
- return putTo(REST_properties, values);
+ return putAllTo(REST_properties, values);
}
/**
@@ -2593,7 +2593,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
super.set(properties);
this.properties.clear();
this.properties.putAll(properties);
- putTo(REST_properties, properties);
+ putAllTo(REST_properties, properties);
return this;
}
@@ -2612,18 +2612,6 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
}
@Override /* GENERATED - ContextBuilder */
- public RestContextBuilder putTo(String name, Object value) {
- super.putTo(name, value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
- public RestContextBuilder putTo(String name, String key, Object value) {
- super.putTo(name, key, value);
- return this;
- }
-
- @Override /* GENERATED - ContextBuilder */
public RestContextBuilder appendTo(String name, Object value) {
super.appendTo(name, value);
return this;
@@ -2660,6 +2648,18 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
}
@Override /* GENERATED - ContextBuilder */
+ public RestContextBuilder putAllTo(String name, Object value) {
+ super.putAllTo(name, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
+ public RestContextBuilder putTo(String name, String key, Object value) {
+ super.putTo(name, key, value);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public RestContextBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
index 793d94e..ec2e183 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
@@ -132,7 +132,7 @@ public class RestMethodConfigApply extends
ConfigApply<RestMethod> {
bpiMap.put(s2.substring(0, i).trim(),
s2.substring(i+1).trim());
}
}
- psb.putTo(BEAN_bpi, bpiMap);
+ psb.putAllTo(BEAN_bpi, bpiMap);
}
if (a.bpx().length > 0) {
@@ -146,7 +146,7 @@ public class RestMethodConfigApply extends
ConfigApply<RestMethod> {
bpxMap.put(s2.substring(0, i).trim(),
s2.substring(i+1).trim());
}
}
- psb.putTo(BEAN_bpx, bpxMap);
+ psb.putAllTo(BEAN_bpx, bpxMap);
}
if (! a.defaultCharset().isEmpty())
@@ -205,7 +205,7 @@ public class RestMethodConfigApply extends
ConfigApply<RestMethod> {
psb.putTo(RESTMETHOD_reqHeaders, "Accept",
string(a.defaultAccept()));
if (! a.defaultContentType().isEmpty())
- psb.putTo(RESTMETHOD_reqHeaders,
string(a.defaultContentType()));
+ psb.putAllTo(RESTMETHOD_reqHeaders,
string(a.defaultContentType()));
for (String h : a.defaultQuery()) {
String[] h2 = RestUtils.parseKeyValuePair(string(h));
