You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/11/14 14:19:11 UTC
[juneau] branch master updated: Code cleanup.
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 5b8444b Code cleanup.
5b8444b is described below
commit 5b8444b8557050cef07e867e5c280f9b4c5e216a
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sat Nov 14 09:19:01 2020 -0500
Code cleanup.
---
.../main/java/org/apache/juneau/config/Config.java | 6 +-
.../org/apache/juneau/config/ConfigBuilder.java | 16 +-
.../config/store/ConfigClasspathStoreBuilder.java | 12 ++
.../juneau/config/store/ConfigFileStore.java | 28 +--
.../config/store/ConfigFileStoreBuilder.java | 24 ++-
.../config/store/ConfigMemoryStoreBuilder.java | 12 ++
.../juneau/config/store/ConfigStoreBuilder.java | 12 ++
.../java/org/apache/juneau/BeanConfigTest.java | 4 +-
.../test/java/org/apache/juneau/BeanMapTest.java | 2 +-
.../java/org/apache/juneau/ContextCacheTest.java | 6 +-
.../java/org/apache/juneau/PropertyStoreTest.java | 8 +-
.../a/rttests/RountTripBeansWithBuilders.java | 12 +-
.../juneau/annotation/BeanAnnotation_Test.java | 10 +-
.../annotation/BeanConfigAnnotation_Test.java | 16 +-
.../org/apache/juneau/annotation/Bean_Test.java | 20 +-
.../apache/juneau/config/ConfigBuilderTest.java | 2 +-
.../juneau/config/store/ConfigFileStoreTest.java | 2 +-
.../java/org/apache/juneau/html/Html_Test.java | 2 +-
.../org/apache/juneau/jena/CommonParserTest.java | 7 +-
.../java/org/apache/juneau/jena/CommonTest.java | 7 +-
.../java/org/apache/juneau/jena/CommonXmlTest.java | 7 +-
.../juneau/jena/RdfConfigAnnotationTest.java | 92 +++++-----
.../test/java/org/apache/juneau/json/JsonTest.java | 4 +-
.../test/java/org/apache/juneau/xml/XmlTest.java | 2 +-
.../java/org/apache/juneau/dto/LinkString.java | 2 +-
.../java/org/apache/juneau/jena/RdfCommon.java | 96 +++++-----
.../java/org/apache/juneau/jena/RdfParser.java | 6 +-
.../org/apache/juneau/jena/RdfParserBuilder.java | 136 +++++++-------
.../java/org/apache/juneau/jena/RdfSerializer.java | 50 +++--
.../apache/juneau/jena/RdfSerializerBuilder.java | 204 ++++++++-------------
.../apache/juneau/jena/RdfSerializerSession.java | 4 +-
.../apache/juneau/jena/annotation/RdfConfig.java | 68 +++----
.../jena/annotation/RdfConfigAnnotation.java | 32 ++--
.../main/java/org/apache/juneau/BeanContext.java | 120 ++++++------
.../java/org/apache/juneau/BeanContextBuilder.java | 108 ++++++-----
.../java/org/apache/juneau/BeanFilterBuilder.java | 33 +---
.../src/main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 12 +-
.../org/apache/juneau/BeanTraverseBuilder.java | 76 ++++----
.../org/apache/juneau/BeanTraverseContext.java | 8 +-
.../src/main/java/org/apache/juneau/Context.java | 89 ++++++++-
.../java/org/apache/juneau/ContextBuilder.java | 38 +++-
.../main/java/org/apache/juneau/PropertyStore.java | 7 +-
.../org/apache/juneau/PropertyStoreBuilder.java | 28 +++
.../java/org/apache/juneau/annotation/Bean.java | 9 +-
.../apache/juneau/annotation/BeanAnnotation.java | 18 +-
.../org/apache/juneau/annotation/BeanConfig.java | 8 +-
.../juneau/annotation/BeanConfigAnnotation.java | 8 +-
.../org/apache/juneau/csv/CsvParserBuilder.java | 72 +++++---
.../apache/juneau/csv/CsvSerializerBuilder.java | 72 +++++---
.../org/apache/juneau/html/HtmlDocSerializer.java | 4 +-
.../juneau/html/HtmlDocSerializerBuilder.java | 74 ++++----
.../org/apache/juneau/html/HtmlParserBuilder.java | 72 +++++---
.../juneau/html/HtmlSchemaSerializerBuilder.java | 78 ++++----
.../org/apache/juneau/html/HtmlSerializer.java | 8 +-
.../apache/juneau/html/HtmlSerializerBuilder.java | 78 ++++----
.../html/HtmlStrippedDocSerializerBuilder.java | 72 +++++---
.../org/apache/juneau/jso/JsoParserBuilder.java | 72 +++++---
.../apache/juneau/jso/JsoSerializerBuilder.java | 72 +++++---
.../java/org/apache/juneau/json/JsonParser.java | 4 +-
.../org/apache/juneau/json/JsonParserBuilder.java | 74 ++++----
.../juneau/json/JsonSchemaSerializerBuilder.java | 82 +++++----
.../org/apache/juneau/json/JsonSerializer.java | 10 +-
.../apache/juneau/json/JsonSerializerBuilder.java | 80 ++++----
.../juneau/json/SimpleJsonParserBuilder.java | 72 +++++---
.../juneau/json/SimpleJsonSerializerBuilder.java | 76 ++++----
.../juneau/jsonschema/JsonSchemaGenerator.java | 10 +-
.../jsonschema/JsonSchemaGeneratorBuilder.java | 78 ++++----
.../juneau/msgpack/MsgPackParserBuilder.java | 72 +++++---
.../apache/juneau/msgpack/MsgPackSerializer.java | 2 +-
.../juneau/msgpack/MsgPackSerializerBuilder.java | 72 +++++---
.../org/apache/juneau/mstat/ExceptionInfo.java | 2 +-
.../org/apache/juneau/mstat/ExceptionStats.java | 2 +-
.../apache/juneau/oapi/OpenApiParserBuilder.java | 72 +++++---
.../juneau/oapi/OpenApiSerializerBuilder.java | 72 +++++---
.../juneau/parser/InputStreamParserBuilder.java | 72 +++++---
.../main/java/org/apache/juneau/parser/Parser.java | 20 +-
.../org/apache/juneau/parser/ParserBuilder.java | 80 ++++----
.../java/org/apache/juneau/parser/ParserGroup.java | 2 +-
.../apache/juneau/parser/ParserGroupBuilder.java | 80 ++++----
.../apache/juneau/parser/ReaderParserBuilder.java | 72 +++++---
.../juneau/plaintext/PlainTextParserBuilder.java | 72 +++++---
.../plaintext/PlainTextSerializerBuilder.java | 72 +++++---
.../serializer/OutputStreamSerializerBuilder.java | 72 +++++---
.../org/apache/juneau/serializer/Serializer.java | 34 ++--
.../juneau/serializer/SerializerBuilder.java | 88 +++++----
.../juneau/serializer/SerializerGroupBuilder.java | 90 +++++----
.../apache/juneau/serializer/WriterSerializer.java | 4 +-
.../juneau/serializer/WriterSerializerBuilder.java | 74 ++++----
.../juneau/soap/SoapXmlSerializerBuilder.java | 72 +++++---
.../main/java/org/apache/juneau/uon/UonParser.java | 8 +-
.../org/apache/juneau/uon/UonParserBuilder.java | 74 ++++----
.../java/org/apache/juneau/uon/UonSerializer.java | 4 +-
.../apache/juneau/uon/UonSerializerBuilder.java | 74 ++++----
.../juneau/urlencoding/UrlEncodingParser.java | 2 +-
.../urlencoding/UrlEncodingParserBuilder.java | 74 ++++----
.../juneau/urlencoding/UrlEncodingSerializer.java | 2 +-
.../urlencoding/UrlEncodingSerializerBuilder.java | 74 ++++----
.../main/java/org/apache/juneau/xml/XmlParser.java | 10 +-
.../org/apache/juneau/xml/XmlParserBuilder.java | 76 ++++----
.../java/org/apache/juneau/xml/XmlSerializer.java | 10 +-
.../apache/juneau/xml/XmlSerializerBuilder.java | 80 ++++----
.../07.MarshallConfigurableProperties.html | 6 +-
.../11.ContextsBuildersSessionsPropertyStores.html | 6 +-
.../06.juneau-rest-server/05.RestContext.html | 4 +-
.../15.RestConfigurableProperties.html | 4 +-
.../01.RestcPojoMarshalling.html | 2 +-
.../juneau/examples/core/dto/DtoExample.java | 4 +-
.../core/json/JsonConfigurationExample.java | 2 +-
.../client/RestClient_Config_BeanContext_Test.java | 6 +-
.../org/apache/juneau/rest/client/RestClient.java | 12 +-
.../juneau/rest/client/RestClientBuilder.java | 106 ++++++-----
.../apache/juneau/rest/mock/MockRestClient.java | 4 +-
.../juneau/rest/mock/MockRestClientBuilder.java | 72 +++++---
.../org/apache/juneau/rest/RestCallLoggerRule.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 16 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 86 +++++----
.../juneau/rest/RestMethodContextBuilder.java | 72 +++++---
.../apache/juneau/rest/annotation/Property.java | 1 +
.../juneau/rest/annotation/RestAnnotation.java | 2 -
.../juneau/rest/helper/ResourceDescription.java | 2 +-
122 files changed, 2678 insertions(+), 2054 deletions(-)
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 326d662..a0fffd3 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -460,10 +460,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
.contextObject(ConfigVar.SESSION_config, this)
.build()
.createSession();
- binaryLineLength = getIntegerProperty(CONFIG_binaryLineLength, -1);
+ binaryLineLength = getIntegerProperty(CONFIG_binaryLineLength);
binaryFormat = getProperty(CONFIG_binaryFormat, BinaryFormat.class, BinaryFormat.BASE64);
- multiLineValuesOnSeparateLines = getBooleanProperty(CONFIG_multiLineValuesOnSeparateLines, false);
- readOnly = getBooleanProperty(CONFIG_readOnly, false);
+ multiLineValuesOnSeparateLines = getBoolean(CONFIG_multiLineValuesOnSeparateLines, false);
+ readOnly = getBoolean(CONFIG_readOnly, false);
}
Config(Config copyFrom, VarResolverSession varSession) {
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 8d30ee0..3e7d0d1 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
@@ -280,7 +280,7 @@ public class ConfigBuilder extends ContextBuilder {
* @return This object (for method chaining).
*/
public ConfigBuilder multiLineValuesOnSeparateLines() {
- return set(CONFIG_multiLineValuesOnSeparateLines, true);
+ return set(CONFIG_multiLineValuesOnSeparateLines);
}
/**
@@ -292,7 +292,7 @@ public class ConfigBuilder extends ContextBuilder {
* @return This object (for method chaining).
*/
public ConfigBuilder readOnly() {
- return set(CONFIG_readOnly, true);
+ return set(CONFIG_readOnly);
}
// <FluentSetters>
@@ -382,6 +382,12 @@ public class ConfigBuilder extends ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -399,5 +405,11 @@ public class ConfigBuilder extends ContextBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
// </FluentSetters>
}
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 cee02de..fab977a 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
@@ -137,6 +137,12 @@ public class ConfigClasspathStoreBuilder extends ConfigStoreBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigClasspathStoreBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigClasspathStoreBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -154,5 +160,11 @@ public class ConfigClasspathStoreBuilder extends ConfigStoreBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigClasspathStoreBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
index 6d944f1..1c04d42 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
@@ -96,15 +96,15 @@ public class ConfigFileStore extends ConfigStore {
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_useWatcher FILESTORE_useWatcher}
- * <li><b>Name:</b> <js>"ConfigFileStore.useWatcher.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_enableWatcher FILESTORE_enableWatcher}
+ * <li><b>Name:</b> <js>"ConfigFileStore.enableWatcher.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>ConfigFileStore.useWatcher</c>
- * <li><b>Environment variable:</b> <c>CONFIGFILESTORE_USEWATCHER</c>
+ * <li><b>System property:</b> <c>ConfigFileStore.enableWatcher</c>
+ * <li><b>Environment variable:</b> <c>CONFIGFILESTORE_ENABLEWATCHER</c>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#useWatcher()}
+ * <li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#enableWatcher()}
* </ul>
* </ul>
*
@@ -116,7 +116,7 @@ public class ConfigFileStore extends ConfigStore {
* <li>Calling {@link #close()} on this object closes the watcher.
* </ul>
*/
- public static final String FILESTORE_useWatcher = PREFIX + ".useWatcher.s";
+ public static final String FILESTORE_enableWatcher = PREFIX + ".enableWatcher.b";
/**
* Configuration property: Watcher sensitivity.
@@ -151,15 +151,15 @@ public class ConfigFileStore extends ConfigStore {
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_updateOnWrite FILESTORE_updateOnWrite}
- * <li><b>Name:</b> <js>"ConfigFileStore.updateOnWrite.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_enableUpdateOnWrite FILESTORE_enableUpdateOnWrite}
+ * <li><b>Name:</b> <js>"ConfigFileStore.enableUpdateOnWrite.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>ConfigFileStore.updateOnWrite</c>
- * <li><b>Environment variable:</b> <c>CONFIGFILESTORE_UPDATEONWRITE</c>
+ * <li><b>System property:</b> <c>ConfigFileStore.enableUpdateOnWrite</c>
+ * <li><b>Environment variable:</b> <c>CONFIGFILESTORE_ENABLEUPDATEONWRITE</c>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#updateOnWrite()}
+ * <li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#enableUpdateOnWrite()}
* </ul>
* </ul>
*
@@ -171,7 +171,7 @@ public class ConfigFileStore extends ConfigStore {
* polling watchers.
* <br>This may cause double-triggering of {@link ConfigStoreListener ConfigStoreListeners}.
*/
- public static final String FILESTORE_updateOnWrite = PREFIX + ".updateOnWrite.b";
+ public static final String FILESTORE_enableUpdateOnWrite = PREFIX + ".enableUpdateOnWrite.b";
/**
* Configuration property: File extensions.
@@ -241,10 +241,10 @@ public class ConfigFileStore extends ConfigStore {
dir = new File(getStringProperty(FILESTORE_directory, ".")).getCanonicalFile();
dir.mkdirs();
charset = getProperty(FILESTORE_charset, Charset.class, Charset.defaultCharset());
- updateOnWrite = getBooleanProperty(FILESTORE_updateOnWrite, false);
+ updateOnWrite = getBooleanProperty(FILESTORE_enableUpdateOnWrite);
extensions = getCdlProperty(FILESTORE_extensions, "cfg");
WatcherSensitivity ws = getProperty(FILESTORE_watcherSensitivity, WatcherSensitivity.class, WatcherSensitivity.MEDIUM);
- watcher = getBooleanProperty(FILESTORE_useWatcher, false) ? new WatcherThread(dir, ws) : null;
+ watcher = getBooleanProperty(FILESTORE_enableWatcher) ? new WatcherThread(dir, ws) : null;
if (watcher != null)
watcher.start();
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 342b715..da39dfa 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
@@ -141,13 +141,13 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
* Shortcut for calling <code>useWatcher(<jk>true</jk>)</code>.
*
* <ul class='seealso'>
- * <li class='jf'>{@link ConfigFileStore#FILESTORE_useWatcher}
+ * <li class='jf'>{@link ConfigFileStore#FILESTORE_enableWatcher}
* </ul>
*
* @return This object (for method chaining).
*/
- public ConfigFileStoreBuilder useWatcher() {
- super.set(FILESTORE_useWatcher, true);
+ public ConfigFileStoreBuilder enableWatcher() {
+ super.set(FILESTORE_enableWatcher);
return this;
}
@@ -178,13 +178,13 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
* Shortcut for calling <code>useWatcher(<jk>true</jk>)</code>.
*
* <ul class='seealso'>
- * <li class='jf'>{@link ConfigFileStore#FILESTORE_updateOnWrite}
+ * <li class='jf'>{@link ConfigFileStore#FILESTORE_enableUpdateOnWrite}
* </ul>
*
* @return This object (for method chaining).
*/
- public ConfigFileStoreBuilder updateOnWrite() {
- super.set(FILESTORE_updateOnWrite, true);
+ public ConfigFileStoreBuilder enableUpdateOnWrite() {
+ super.set(FILESTORE_enableUpdateOnWrite);
return this;
}
@@ -311,6 +311,12 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigFileStoreBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigFileStoreBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -328,5 +334,11 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigFileStoreBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
// </FluentSetters>
}
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 6bb14da..5d0b897 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
@@ -137,6 +137,12 @@ public class ConfigMemoryStoreBuilder extends ConfigStoreBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigMemoryStoreBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigMemoryStoreBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -154,5 +160,11 @@ public class ConfigMemoryStoreBuilder extends ConfigStoreBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigMemoryStoreBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
// </FluentSetters>
}
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 d8a1722..f5a0cf2 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
@@ -135,6 +135,12 @@ public abstract class ConfigStoreBuilder extends ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ConfigStoreBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ConfigStoreBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -152,5 +158,11 @@ public abstract class ConfigStoreBuilder extends ContextBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ConfigStoreBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
// </FluentSetters>
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
index 6258cde..3048fe6 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
@@ -730,9 +730,9 @@ public class BeanConfigTest {
p2.disableIgnoreUnknownNullBeanProperties();
assertSameCache(p1, p2);
- p1.disableSilentlyIgnoreMissingSetters();
+ p1.disableIgnoreMissingSetters();
assertDifferentCache(p1, p2);
- p2.disableSilentlyIgnoreMissingSetters();
+ p2.disableIgnoreMissingSetters();
assertSameCache(p1, p2);
p1.ignoreInvocationExceptionsOnGetters();
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index b841d4a..d54ecdf 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -1910,7 +1910,7 @@ public class BeanMapTest {
@Test
public void testBeanPropertyOrder_usingConfig() throws Exception {
- WriterSerializer ws = JsonSerializer.create().simple().sq().applyAnnotations(VcConfig.class).build();
+ WriterSerializer ws = SimpleJsonSerializer.create().applyAnnotations(VcConfig.class).build();
assertEquals("{a1:'1',a2:'2',a3:'3',a4:'4'}", ws.toString(new V2c()));
assertEquals("{a3:'3',a4:'4',a5:'5',a6:'6'}", ws.toString(new V3c()));
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ContextCacheTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ContextCacheTest.java
index b16443f..4eed4a0 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ContextCacheTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ContextCacheTest.java
@@ -85,7 +85,7 @@ public class ContextCacheTest {
a = a2; b = b2; c = c2;
- ps = psb.set("C.f3.b", true).build();
+ ps = psb.set("C.f3.b").build();
a2 = ContextCache.INSTANCE.create(A.class, ps);
b2 = ContextCache.INSTANCE.create(B.class, ps);
@@ -157,7 +157,7 @@ public class ContextCacheTest {
public B(PropertyStore ps) {
super(ps);
- f2 = getIntegerProperty("B.f2.i", -1);
+ f2 = getIntegerProperty("B.f2.i");
}
@@ -172,7 +172,7 @@ public class ContextCacheTest {
public boolean f3;
public C(PropertyStore ps) {
super(ps);
- f3 = getBooleanProperty("C.f3.b", false);
+ f3 = getBooleanProperty("C.f3.b");
}
@Override
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 1284e4f..3611052 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
@@ -915,18 +915,18 @@ public class PropertyStoreTest {
PropertyStoreBuilder b1 = PropertyStore.create(), b2 = PropertyStore.create();
PropertyStore ps = null;
- b1.set("A.f1.b", true);
+ b1.set("A.f1.b");
b2.set("A.f1.b", new StringBuilder("true"));
testEquals(b1, b2);
testEquals(b1, b1);
- b1.set("A.f1.b", true);
+ b1.set("A.f1.b");
b2.set("A.f1.b", new StringBuilder("false"));
testNotEquals(b1, b2);
ps = b1.build();
- b1.set("A.f1.b", true);
+ b1.set("A.f1.b");
assertTrue(ps == b1.build());
b1.set("A.f1.b", false);
@@ -1678,7 +1678,7 @@ public class PropertyStoreTest {
public void testToMutable() {
PropertyStoreBuilder b = PropertyStore.create();
b.set("A.foo.s", "bar");
- b.set("A.foo.b", true);
+ b.set("A.foo.b");
b.set("A.foo.i", 123);
b.set("A.foo.c", String.class);
b.set("A.foo.o", "bar");
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java
index 8729a83..fcc6552 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RountTripBeansWithBuilders.java
@@ -57,7 +57,7 @@ public class RountTripBeansWithBuilders extends RoundTripTest {
return new Builder();
}
- @Bean(fluentSetters=true)
+ @Bean(findFluentSetters=true)
public static class Builder {
private int f1;
@@ -83,9 +83,9 @@ public class RountTripBeansWithBuilders extends RoundTripTest {
assertObject(a).json().is("{f1:1}");
}
- @Bean(on="Dummy1", fluentSetters=true)
- @Bean(on="Builder", fluentSetters=true)
- @Bean(on="Dummy2", fluentSetters=true)
+ @Bean(on="Dummy1", findFluentSetters=true)
+ @Bean(on="Builder", findFluentSetters=true)
+ @Bean(on="Dummy2", findFluentSetters=true)
private static class AcConfig {}
public static class Ac {
@@ -139,7 +139,7 @@ public class RountTripBeansWithBuilders extends RoundTripTest {
return new Builder();
}
- @Bean(fluentSetters=true)
+ @Bean(findFluentSetters=true)
public static class Builder {
private A f1;
@@ -213,7 +213,7 @@ public class RountTripBeansWithBuilders extends RoundTripTest {
return new Builder();
}
- @Bean(fluentSetters=true)
+ @Bean(findFluentSetters=true)
public static class Builder {
private A[] f1;
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
index 361e9eb..9df63af 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
@@ -36,7 +36,7 @@ public class BeanAnnotation_Test {
.dictionary(X1.class)
.example("example")
.excludeProperties("excludeProperties")
- .fluentSetters(true)
+ .findFluentSetters(true)
.implClass(X1.class)
.interceptor(X2.class)
.interfaceClass(X1.class)
@@ -60,7 +60,7 @@ public class BeanAnnotation_Test {
.dictionary(X1.class)
.example("example")
.excludeProperties("excludeProperties")
- .fluentSetters(true)
+ .findFluentSetters(true)
.implClass(X1.class)
.interceptor(X2.class)
.interfaceClass(X1.class)
@@ -87,7 +87,7 @@ public class BeanAnnotation_Test {
+ "dictionary:['"+CNAME+"$X1'],"
+ "example:'example',"
+ "excludeProperties:'excludeProperties',"
- + "fluentSetters:true,"
+ + "findFluentSetters:true,"
+ "implClass:'"+CNAME+"$X1',"
+ "interceptor:'"+CNAME+"$X2',"
+ "interfaceClass:'"+CNAME+"$X1',"
@@ -150,7 +150,7 @@ public class BeanAnnotation_Test {
dictionary=X1.class,
example="example",
excludeProperties="excludeProperties",
- fluentSetters=true,
+ findFluentSetters=true,
implClass=X1.class,
interceptor=X2.class,
interfaceClass=X1.class,
@@ -176,7 +176,7 @@ public class BeanAnnotation_Test {
dictionary=X1.class,
example="example",
excludeProperties="excludeProperties",
- fluentSetters=true,
+ findFluentSetters=true,
implClass=X1.class,
interceptor=X2.class,
interfaceClass=X1.class,
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
index 2d2c9e4..f8b82ef 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
@@ -121,9 +121,9 @@ public class BeanConfigAnnotation_Test {
debug="$X{true}",
detectRecursions="$X{true}",
disableIgnoreUnknownNullBeanProperties="$X{true}",
- disableSilentlyIgnoreMissingSetters="$X{true}",
+ disableIgnoreMissingSetters="$X{true}",
disableInterfaceProxies="$X{true}",
- fluentSetters="$X{true}",
+ findFluentSetters="$X{true}",
ignoreInvocationExceptionsOnGetters="$X{true}",
ignoreInvocationExceptionsOnSetters="$X{true}",
ignoreRecursions="$X{true}",
@@ -165,10 +165,10 @@ public class BeanConfigAnnotation_Test {
check("foo", bc.getBeanTypePropertyName());
check("true", bc.isDebug());
check("true", bc.isDetectRecursions());
- check("true", bc.isFluentSetters());
+ check("true", bc.isFindFluentSetters());
check("true", bc.isIgnoreInvocationExceptionsOnGetters());
check("true", bc.isIgnoreInvocationExceptionsOnSetters());
- check("false", bc.isSilentlyIgnoreMissingSetters());
+ check("false", bc.isIgnoreMissingSetters());
check("true", bc.isIgnoreRecursions());
check("true", bc.isIgnoreUnknownBeanProperties());
check("false", bc.isIgnoreUnknownNullBeanProperties());
@@ -212,10 +212,10 @@ public class BeanConfigAnnotation_Test {
check("_type", bc.getBeanTypePropertyName());
check("false", bc.isDebug());
check("false", bc.isDetectRecursions());
- check("false", bc.isFluentSetters());
+ check("false", bc.isFindFluentSetters());
check("false", bc.isIgnoreInvocationExceptionsOnGetters());
check("false", bc.isIgnoreInvocationExceptionsOnSetters());
- check("true", bc.isSilentlyIgnoreMissingSetters());
+ check("true", bc.isIgnoreMissingSetters());
check("false", bc.isIgnoreRecursions());
check("false", bc.isIgnoreUnknownBeanProperties());
check("true", bc.isIgnoreUnknownNullBeanProperties());
@@ -257,10 +257,10 @@ public class BeanConfigAnnotation_Test {
check("_type", bc.getBeanTypePropertyName());
check("false", bc.isDebug());
check("false", bc.isDetectRecursions());
- check("false", bc.isFluentSetters());
+ check("false", bc.isFindFluentSetters());
check("false", bc.isIgnoreInvocationExceptionsOnGetters());
check("false", bc.isIgnoreInvocationExceptionsOnSetters());
- check("true", bc.isSilentlyIgnoreMissingSetters());
+ check("true", bc.isIgnoreMissingSetters());
check("false", bc.isIgnoreRecursions());
check("false", bc.isIgnoreUnknownBeanProperties());
check("true", bc.isIgnoreUnknownNullBeanProperties());
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
index 29acbce..4156050 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
@@ -72,7 +72,7 @@ public class Bean_Test {
@Test
public void testBeanAnnotationOverridesPrivate_usingConfig() throws Exception {
AnnotationList al = a2ci.getAnnotationList();
- JsonSerializer js = JsonSerializer.create().simple().applyAnnotations(al, null).build();
+ JsonSerializer js = SimpleJsonSerializer.create().applyAnnotations(al, null).build();
JsonParser jp = JsonParser.create().applyAnnotations(al, null).build();
String json = js.serialize(A2.create());
@@ -158,7 +158,7 @@ public class Bean_Test {
@Test
public void testBeanxAnnotationOverridesPrivate_usingConfig() throws Exception {
AnnotationList al = b2ci.getAnnotationList();
- JsonSerializer js = JsonSerializer.create().simple().applyAnnotations(al, null).build();
+ JsonSerializer js = SimpleJsonSerializer.create().applyAnnotations(al, null).build();
JsonParser jp = JsonParser.create().applyAnnotations(al, null).build();
String json = js.serialize(B2.create());
@@ -228,7 +228,7 @@ public class Bean_Test {
@Test
public void d03_beanPropertiesExcludePropertiesCombined_beanConfigOverride() throws Exception {
AnnotationList al = dConfig.getAnnotationList();
- JsonSerializer js = JsonSerializer.create().simple().applyAnnotations(al, vr).build();
+ JsonSerializer js = SimpleJsonSerializer.create().applyAnnotations(al, vr).build();
JsonParser jp = JsonParser.create().applyAnnotations(al, vr).build();
String json = js.serialize(D1.create());
@@ -241,7 +241,7 @@ public class Bean_Test {
@Test
public void d04_beanPXpCombined_beanConfigOverride() throws Exception {
AnnotationList al = dConfig.getAnnotationList();
- JsonSerializer js = JsonSerializer.create().simple().applyAnnotations(al, vr).build();
+ JsonSerializer js = SimpleJsonSerializer.create().applyAnnotations(al, vr).build();
JsonParser jp = JsonParser.create().applyAnnotations(al, vr).build();
String json = js.serialize(D2.create());
@@ -254,7 +254,7 @@ public class Bean_Test {
@Test
public void d05_beanPropertiesExcludePropertiesCombined_beanContextBuilderOverride() throws Exception {
Bean ba = BeanAnnotation.create("D1").properties("b,c,d").excludeProperties("c").build();
- JsonSerializer js = JsonSerializer.create().simple().annotations(ba).build();
+ JsonSerializer js = SimpleJsonSerializer.create().annotations(ba).build();
JsonParser jp = JsonParser.create().annotations(ba).build();
String json = js.serialize(D1.create());
@@ -267,7 +267,7 @@ public class Bean_Test {
@Test
public void d06_beanPXpCombined_beanContextBuilderOverride() throws Exception {
Bean ba = BeanAnnotation.create("D2").p("b,c,d").xp("c").build();
- JsonSerializer js = JsonSerializer.create().simple().annotations(ba).build();
+ JsonSerializer js = SimpleJsonSerializer.create().annotations(ba).build();
JsonParser jp = JsonParser.create().annotations(ba).build();
String json = js.serialize(D2.create());
@@ -345,7 +345,7 @@ public class Bean_Test {
@Test
public void e03_beanPropertiesExcludePropertiesCombined_multipleBeanAnnotations_beanConfigOverride() throws Exception {
AnnotationList al = eConfig.getAnnotationList();
- JsonSerializer js = JsonSerializer.create().simple().applyAnnotations(al, vr).build();
+ JsonSerializer js = SimpleJsonSerializer.create().applyAnnotations(al, vr).build();
JsonParser jp = JsonParser.create().applyAnnotations(al, vr).build();
String json = js.serialize(E1.create());
@@ -358,7 +358,7 @@ public class Bean_Test {
@Test
public void e04_beanPXpCombined_multipleBeanAnnotations_beanConfigOverride() throws Exception {
AnnotationList al = eConfig.getAnnotationList();
- JsonSerializer js = JsonSerializer.create().simple().applyAnnotations(al, vr).build();
+ JsonSerializer js = SimpleJsonSerializer.create().applyAnnotations(al, vr).build();
JsonParser jp = JsonParser.create().applyAnnotations(al, vr).build();
String json = js.serialize(E2.create());
@@ -371,7 +371,7 @@ public class Bean_Test {
@Test
public void e05_beanPropertiersExcludePropertiesCombined_multipleBeanAnnotations_beanContextBuilderOverride() throws Exception {
Bean ba = BeanAnnotation.create("E1").properties("b,c,d").excludeProperties("c").build();
- JsonSerializer js = JsonSerializer.create().simple().annotations(ba).build();
+ JsonSerializer js = SimpleJsonSerializer.create().annotations(ba).build();
JsonParser jp = JsonParser.create().annotations(ba).build();
String json = js.serialize(E1.create());
@@ -384,7 +384,7 @@ public class Bean_Test {
@Test
public void e06_beanBpiBpxCombined_multipleBeanAnnotations_beanContextBuilderOverride() throws Exception {
Bean ba = BeanAnnotation.create("E2").p("b,c,d").xp("c").build();
- JsonSerializer js = JsonSerializer.create().simple().annotations(ba).build();
+ JsonSerializer js = SimpleJsonSerializer.create().annotations(ba).build();
JsonParser jp = JsonParser.create().annotations(ba).build();
String json = js.serialize(E2.create());
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
index a0f97b3..c88a2e4 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
@@ -43,7 +43,7 @@ public class ConfigBuilderTest {
@Test
public void testGet_LONGRUNNING() throws Exception {
File f;
- ConfigFileStore cfs = ConfigFileStore.create().directory(TEMP_DIR).useWatcher().watcherSensitivity(WatcherSensitivity.HIGH).build();
+ ConfigFileStore cfs = ConfigFileStore.create().directory(TEMP_DIR).enableWatcher().watcherSensitivity(WatcherSensitivity.HIGH).build();
ConfigBuilder cb = Config.create().store(cfs).name("TestGet.cfg");
Config cf = cb.build();
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
index bd29861..270196b 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
@@ -139,7 +139,7 @@ public class ConfigFileStoreTest {
@Test
public void testWatcher_LONGRUNNING() throws Exception {
- ConfigFileStore fs = ConfigFileStore.create().directory(DIR).useWatcher().watcherSensitivity(WatcherSensitivity.HIGH).build();
+ ConfigFileStore fs = ConfigFileStore.create().directory(DIR).enableWatcher().watcherSensitivity(WatcherSensitivity.HIGH).build();
final CountDownLatch latch = new CountDownLatch(4);
fs.register("X.cfg", new ConfigStoreListener() {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/Html_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/Html_Test.java
index 5764118..902429c 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/Html_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/Html_Test.java
@@ -178,7 +178,7 @@ public class Html_Test {
+"\n[fe]=http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL";
assertEquals(expected, r);
- s.set(HtmlSerializer.HTML_disableDetectLinksInStrings, false);
+ s.unset(HtmlSerializer.HTML_disableDetectLinksInStrings);
s.disableDetectLabelParameters();
r = strip(s.build().serialize(t));
expected = ""
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonParserTest.java
index c5b91e4..a07ee0f 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonParserTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonParserTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.jena;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.jena.RdfCommon.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -47,9 +46,9 @@ public class CommonParserTest {
return RdfSerializer.create()
.sq()
.addLiteralTypes()
- .set(RDF_rdfxml_allowBadUris, true)
- .set(RDF_rdfxml_showDoctypeDeclaration, false)
- .set(RDF_rdfxml_showXmlDeclaration, false);
+ .rdfxml_allowBadUris()
+ .rdfxml_disableShowDoctypeDeclaration()
+ .rdfxml_showXmlDeclaration("false");
}
//====================================================================================================
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonTest.java
index 666c0ac..109af53 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.jena;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.jena.RdfCommon.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -33,9 +32,9 @@ public class CommonTest {
private RdfSerializerBuilder getBasicSerializer() {
return RdfSerializer.create()
.sq()
- .set(RDF_rdfxml_allowBadUris, true)
- .set(RDF_rdfxml_showDoctypeDeclaration, false)
- .set(RDF_rdfxml_showXmlDeclaration, false);
+ .rdfxml_allowBadUris()
+ .rdfxml_disableShowDoctypeDeclaration()
+ .rdfxml_showXmlDeclaration("false");
}
private String strip(String s) {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
index 59212de..1a77e62 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.jena;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.jena.RdfCommon.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -29,9 +28,9 @@ public class CommonXmlTest {
private RdfSerializerBuilder getBasicSerializer() {
return RdfSerializer.create()
.sq()
- .set(RDF_rdfxml_allowBadUris, true)
- .set(RDF_rdfxml_showDoctypeDeclaration, false)
- .set(RDF_rdfxml_showXmlDeclaration, false);
+ .rdfxml_allowBadUris()
+ .rdfxml_disableShowDoctypeDeclaration()
+ .rdfxml_showXmlDeclaration("false");
}
private String strip(String s) {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
index 18295d2..5a1d726 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
@@ -66,21 +66,21 @@ public class RdfConfigAnnotationTest {
arp_embedding="$X{true}",
arp_errorMode="$X{strict}",
arp_iriRules="$X{strict}",
- autoDetectNamespaces="$X{true}",
+ disableAutoDetectNamespaces="$X{true}",
collectionFormat="$X{SEQ}",
juneauBpNs="$X{foo:http://foo}",
juneauNs="$X{foo:http://foo}",
language="$X{N3}",
looseCollections="$X{true}",
- n3_abbrevBaseUri="$X{true}",
+ n3_disableAbbrevBaseUri="$X{true}",
n3_indentProperty="$X{1}",
n3_minGap="$X{1}",
- n3_objectLists="$X{true}",
+ n3_disableObjectLists="$X{true}",
n3_propertyColumn="$X{1}",
n3_subjectColumn="$X{1}",
- n3_useDoubles="$X{true}",
- n3_usePropertySymbols="$X{true}",
- n3_useTripleQuotedStrings="$X{true}",
+ n3_disableUseDoubles="$X{true}",
+ n3_disableUsePropertySymbols="$X{true}",
+ n3_disableUseTripleQuotedStrings="$X{true}",
n3_widePropertyLen="$X{1}",
namespaces="$X{foo:http://foo}",
rdfxml_allowBadUris="$X{true}",
@@ -88,12 +88,12 @@ public class RdfConfigAnnotationTest {
rdfxml_blockRules="$X{foo}",
rdfxml_longId="$X{true}",
rdfxml_relativeUris="$X{absolute}",
- rdfxml_showDoctypeDeclaration="$X{true}",
+ rdfxml_disableShowDoctypeDeclaration="$X{true}",
rdfxml_showXmlDeclaration="$X{true}",
rdfxml_tab="$X{1}",
rdfxml_xmlBase="$X{foo}",
trimWhitespace="$X{true}",
- useXmlNamespaces="$X{true}"
+ disableUseXmlNamespaces="$X{true}"
)
static class A {}
static ClassInfo a = ClassInfo.of(A.class);
@@ -105,35 +105,35 @@ public class RdfConfigAnnotationTest {
check("true", x.isAddBeanTypes());
check("true", x.isAddLiteralTypes());
check("true", x.isAddRootProp());
- check("true", x.isAutoDetectNamespaces());
+ check("false", x.isAutoDetectNamespaces());
check("SEQ", x.getCollectionFormat());
check("foo:http://foo", x.getJuneauBpNs());
check("foo:http://foo", x.getJuneauNs());
check("N3", x.getLanguage());
check("true", x.isLooseCollections());
check("foo:http://foo", x.getNamespaces());
- check("true", x.isUseXmlNamespaces());
+ check("false", x.isUseXmlNamespaces());
Map<String,Object> jp = x.getJenaProperties();
check("true", jp.get(RDF_arp_embedding.substring(15)));
check("strict", jp.get(RDF_arp_errorMode.substring(15)));
check("strict", jp.get(RDF_arp_iriRules.substring(15)));
- check("true", jp.get(RDF_n3_abbrevBaseUri.substring(15)));
+ check("true", jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
check("1", jp.get(RDF_n3_indentProperty.substring(15)));
check("1", jp.get(RDF_n3_minGap.substring(15)));
- check("true", jp.get(RDF_n3_objectLists.substring(15)));
+ check("true", jp.get(RDF_n3_disableObjectLists.substring(15)));
check("1", jp.get(RDF_n3_propertyColumn.substring(15)));
check("1", jp.get(RDF_n3_subjectColumn.substring(15)));
- check("true", jp.get(RDF_n3_useDoubles.substring(15)));
- check("true", jp.get(RDF_n3_usePropertySymbols.substring(15)));
- check("true", jp.get(RDF_n3_useTripleQuotedStrings.substring(15)));
+ check("true", jp.get(RDF_n3_disableUseDoubles.substring(15)));
+ check("true", jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
+ check("true", jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
check("1", jp.get(RDF_n3_widePropertyLen.substring(15)));
check("true", jp.get(RDF_rdfxml_allowBadUris.substring(15)));
check("'", jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
check("foo", jp.get(RDF_rdfxml_blockRules.substring(15)));
check("true", jp.get(RDF_rdfxml_longId.substring(15)));
check("absolute", jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check("true", jp.get(RDF_rdfxml_showDoctypeDeclaration.substring(15)));
+ check("true", jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
check("true", jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
check("1", jp.get(RDF_rdfxml_tab.substring(15)));
check("foo", jp.get(RDF_rdfxml_xmlBase.substring(15)));
@@ -154,22 +154,22 @@ public class RdfConfigAnnotationTest {
check("true", jp.get(RDF_arp_embedding.substring(15)));
check("strict", jp.get(RDF_arp_errorMode.substring(15)));
check("strict", jp.get(RDF_arp_iriRules.substring(15)));
- check("true", jp.get(RDF_n3_abbrevBaseUri.substring(15)));
+ check("true", jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
check("1", jp.get(RDF_n3_indentProperty.substring(15)));
check("1", jp.get(RDF_n3_minGap.substring(15)));
- check("true", jp.get(RDF_n3_objectLists.substring(15)));
+ check("true", jp.get(RDF_n3_disableObjectLists.substring(15)));
check("1", jp.get(RDF_n3_propertyColumn.substring(15)));
check("1", jp.get(RDF_n3_subjectColumn.substring(15)));
- check("true", jp.get(RDF_n3_useDoubles.substring(15)));
- check("true", jp.get(RDF_n3_usePropertySymbols.substring(15)));
- check("true", jp.get(RDF_n3_useTripleQuotedStrings.substring(15)));
+ check("true", jp.get(RDF_n3_disableUseDoubles.substring(15)));
+ check("true", jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
+ check("true", jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
check("1", jp.get(RDF_n3_widePropertyLen.substring(15)));
check("true", jp.get(RDF_rdfxml_allowBadUris.substring(15)));
check("'", jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
check("foo", jp.get(RDF_rdfxml_blockRules.substring(15)));
check("true", jp.get(RDF_rdfxml_longId.substring(15)));
check("absolute", jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check("true", jp.get(RDF_rdfxml_showDoctypeDeclaration.substring(15)));
+ check("true", jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
check("true", jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
check("1", jp.get(RDF_rdfxml_tab.substring(15)));
check("foo", jp.get(RDF_rdfxml_xmlBase.substring(15)));
@@ -203,22 +203,22 @@ public class RdfConfigAnnotationTest {
check(null, jp.get(RDF_arp_embedding.substring(15)));
check(null, jp.get(RDF_arp_errorMode.substring(15)));
check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_abbrevBaseUri.substring(15)));
+ check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
check(null, jp.get(RDF_n3_indentProperty.substring(15)));
check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_objectLists.substring(15)));
+ check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_useDoubles.substring(15)));
- check(null, jp.get(RDF_n3_usePropertySymbols.substring(15)));
- check(null, jp.get(RDF_n3_useTripleQuotedStrings.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
+ check(null, jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
check(null, jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
check(null, jp.get(RDF_rdfxml_longId.substring(15)));
check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null, jp.get(RDF_rdfxml_showDoctypeDeclaration.substring(15)));
+ check(null, jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_tab.substring(15)));
check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
@@ -239,22 +239,22 @@ public class RdfConfigAnnotationTest {
check(null, jp.get(RDF_arp_embedding.substring(15)));
check(null, jp.get(RDF_arp_errorMode.substring(15)));
check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_abbrevBaseUri.substring(15)));
+ check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
check(null, jp.get(RDF_n3_indentProperty.substring(15)));
check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_objectLists.substring(15)));
+ check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_useDoubles.substring(15)));
- check(null, jp.get(RDF_n3_usePropertySymbols.substring(15)));
- check(null, jp.get(RDF_n3_useTripleQuotedStrings.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
+ check(null, jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
check(null, jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
check(null, jp.get(RDF_rdfxml_longId.substring(15)));
check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null, jp.get(RDF_rdfxml_showDoctypeDeclaration.substring(15)));
+ check(null, jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_tab.substring(15)));
check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
@@ -287,22 +287,22 @@ public class RdfConfigAnnotationTest {
check(null, jp.get(RDF_arp_embedding.substring(15)));
check(null, jp.get(RDF_arp_errorMode.substring(15)));
check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_abbrevBaseUri.substring(15)));
+ check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
check(null, jp.get(RDF_n3_indentProperty.substring(15)));
check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_objectLists.substring(15)));
+ check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_useDoubles.substring(15)));
- check(null, jp.get(RDF_n3_usePropertySymbols.substring(15)));
- check(null, jp.get(RDF_n3_useTripleQuotedStrings.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
+ check(null, jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
check(null, jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
check(null, jp.get(RDF_rdfxml_longId.substring(15)));
check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null, jp.get(RDF_rdfxml_showDoctypeDeclaration.substring(15)));
+ check(null, jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_tab.substring(15)));
check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
@@ -323,22 +323,22 @@ public class RdfConfigAnnotationTest {
check(null, jp.get(RDF_arp_embedding.substring(15)));
check(null, jp.get(RDF_arp_errorMode.substring(15)));
check(null, jp.get(RDF_arp_iriRules.substring(15)));
- check(null, jp.get(RDF_n3_abbrevBaseUri.substring(15)));
+ check(null, jp.get(RDF_n3_disableAbbrevBaseUri.substring(15)));
check(null, jp.get(RDF_n3_indentProperty.substring(15)));
check(null, jp.get(RDF_n3_minGap.substring(15)));
- check(null, jp.get(RDF_n3_objectLists.substring(15)));
+ check(null, jp.get(RDF_n3_disableObjectLists.substring(15)));
check(null, jp.get(RDF_n3_propertyColumn.substring(15)));
check(null, jp.get(RDF_n3_subjectColumn.substring(15)));
- check(null, jp.get(RDF_n3_useDoubles.substring(15)));
- check(null, jp.get(RDF_n3_usePropertySymbols.substring(15)));
- check(null, jp.get(RDF_n3_useTripleQuotedStrings.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseDoubles.substring(15)));
+ check(null, jp.get(RDF_n3_disableUsePropertySymbols.substring(15)));
+ check(null, jp.get(RDF_n3_disableUseTripleQuotedStrings.substring(15)));
check(null, jp.get(RDF_n3_widePropertyLen.substring(15)));
check(null, jp.get(RDF_rdfxml_allowBadUris.substring(15)));
check(null, jp.get(RDF_rdfxml_attributeQuoteChar.substring(15)));
check(null, jp.get(RDF_rdfxml_blockRules.substring(15)));
check(null, jp.get(RDF_rdfxml_longId.substring(15)));
check(null, jp.get(RDF_rdfxml_relativeUris.substring(15)));
- check(null, jp.get(RDF_rdfxml_showDoctypeDeclaration.substring(15)));
+ check(null, jp.get(RDF_rdfxml_disableShowDoctypeDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_showXmlDeclaration.substring(15)));
check(null, jp.get(RDF_rdfxml_tab.substring(15)));
check(null, jp.get(RDF_rdfxml_xmlBase.substring(15)));
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonTest.java
index e9360e6..03c2130 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonTest.java
@@ -36,7 +36,7 @@ public class JsonTest {
List<Object> l = new LinkedList<>();
WriterSerializer s1 = JsonSerializer.create().ssq().keepNullProperties().build();
- WriterSerializer s2 = JsonSerializer.create().simple().keepNullProperties().build();
+ WriterSerializer s2 = JsonSerializer.create().simpleMode().keepNullProperties().build();
String r;
// Null keys and values
@@ -111,7 +111,7 @@ public class JsonTest {
//====================================================================================================
@Test
public void testBackslashesInStrings() throws Exception {
- JsonSerializer s = JsonSerializer.create().simple().keepNullProperties().build();
+ JsonSerializer s = JsonSerializer.create().simpleMode().keepNullProperties().build();
String r, r2;
// [\\]
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
index 29c4318..c397adf 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
@@ -80,7 +80,7 @@ public class XmlTest {
+"</object>\n";
OMap m = (OMap) XmlParser.DEFAULT.parse(xml1, Object.class);
- String json2 = JsonSerializer.create().simple().ws().keepNullProperties().build().serialize(m);
+ String json2 = JsonSerializer.create().simpleMode().ws().keepNullProperties().build().serialize(m);
assertEquals(json1, json2);
m = (OMap) JsonParser.DEFAULT.parse(json1, Object.class);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
index be24f1f..9456c57 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
@@ -39,7 +39,7 @@ import org.apache.juneau.utils.*;
* All other serializers simply convert it to a simple bean.
*/
@HtmlLink
-@Bean(fluentSetters=true)
+@Bean(findFluentSetters=true)
public class LinkString implements Comparable<LinkString> {
private String name;
private java.net.URI uri;
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
index 449659f..ae5085a 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
@@ -478,19 +478,19 @@ public interface RdfCommon {
public static final String RDF_rdfxml_showXmlDeclaration = PREFIX + ".jena.rdfXml.showXmlDeclaration.s";
/**
- * Configuration property: RDF/XML property: <c>showDoctypeDeclaration</c>.
+ * Configuration property: RDF/XML property: <c>disableShowDoctypeDeclaration</c>.
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_showDoctypeDeclaration RDF_rdfxml_showDoctypeDeclaration}
- * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.showDoctypeDeclaration.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_disableShowDoctypeDeclaration RDF_rdfxml_disableShowDoctypeDeclaration}
+ * <li><b>Name:</b> <js>"RdfCommon.jena.rdfXml.disableShowDoctypeDeclaration.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.showDoctypeDeclaration</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_RDFXML_SHOWDOCTYPEDECLARATION</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfCommon.jena.rdfXml.disableShowDoctypeDeclaration</c>
+ * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_RDFXML_DISABLESHOWDOCTYPEDECLARATION</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#rdfxml_showDoctypeDeclaration()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#rdfxml_disableShowDoctypeDeclaration()}
* </ul>
* </ul>
*
@@ -501,7 +501,7 @@ public interface RdfCommon {
* attribute value that starts with the URI of that mapping is written as starting with the corresponding entity
* invocation.
*/
- public static final String RDF_rdfxml_showDoctypeDeclaration = PREFIX + ".jena.rdfXml.showDoctypeDeclaration.b";
+ public static final String RDF_rdfxml_disableShowDoctypeDeclaration = PREFIX + ".jena.rdfXml.disableShowDoctypeDeclaration.b";
/**
* Configuration property: RDF/XML property: <c>tab</c>.
@@ -598,19 +598,19 @@ public interface RdfCommon {
public static final String RDF_n3_minGap = PREFIX + ".jena.n3.minGap.i";
/**
- * Configuration property: N3/Turtle property: <c>objectLists</c>.
+ * Configuration property: N3/Turtle property: <c>disableObjectLists</c>.
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_objectLists RDF_n3_objectLists}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.objectLists.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_disableObjectLists RDF_n3_disableObjectLists}
+ * <li><b>Name:</b> <js>"RdfCommon.jena.n3.disableObjectLists.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.n3.objectLists</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_OBJECTLISTS</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfCommon.jena.n3.disableObjectLists</c>
+ * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_DISABLEOBJECTLISTS</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_objectLists()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_disableObjectLists()}
* </ul>
* </ul>
*
@@ -618,7 +618,7 @@ public interface RdfCommon {
* <p>
* Print object lists as comma separated lists.
*/
- public static final String RDF_n3_objectLists = PREFIX + ".jena.n3.objectLists.b";
+ public static final String RDF_n3_disableObjectLists = PREFIX + ".jena.n3.disableObjectLists.b";
/**
* Configuration property: N3/Turtle property: <c>subjectColumn</c>.
@@ -714,19 +714,19 @@ public interface RdfCommon {
public static final String RDF_n3_widePropertyLen = PREFIX + ".jena.n3.widePropertyLen.i";
/**
- * Configuration property: N3/Turtle property: <c>abbrevBaseURI</c>.
+ * Configuration property: N3/Turtle property: <c>disableAbbrevBaseUri</c>.
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_abbrevBaseUri RDF_n3_abbrevBaseUri}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.abbrevBaseURI.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_disableAbbrevBaseUri RDF_n3_disableAbbrevBaseUri}
+ * <li><b>Name:</b> <js>"RdfCommon.jena.n3.disableAbbrevBaseUri.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.n3.abbrevBaseURI</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_ABBREVBASEURI</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfCommon.jena.n3.disableAbbrevBaseUri</c>
+ * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_DISABLEABBREVBASEURI</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_abbrevBaseUri()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_disableAbbrevBaseUri()}
* </ul>
* </ul>
*
@@ -734,22 +734,22 @@ public interface RdfCommon {
* <p>
* Control whether to use abbreviations <c><></c> or <c><#></c>.
*/
- public static final String RDF_n3_abbrevBaseUri = PREFIX + ".jena.n3.abbrevBaseURI.b";
+ public static final String RDF_n3_disableAbbrevBaseUri = PREFIX + ".jena.n3.disableAbbrevBaseUuri.b";
/**
- * Configuration property: N3/Turtle property: <c>usePropertySymbols</c>.
+ * Configuration property: N3/Turtle property: <c>disableUsePropertySymbols</c>.
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_usePropertySymbols RDF_n3_usePropertySymbols}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.usePropertySymbols.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_disableUsePropertySymbols RDF_n3_disableUsePropertySymbols}
+ * <li><b>Name:</b> <js>"RdfCommon.jena.n3.disableUsePropertySymbols.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.n3.usePropertySymbols</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_USEPROPERTYSYMBOLS</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfCommon.jena.n3.disableUsePropertySymbols</c>
+ * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_DISABLEUSEPROPERTYSYMBOLS</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_usePropertySymbols()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_disableUsePropertySymbols()}
* </ul>
* </ul>
*
@@ -757,22 +757,22 @@ public interface RdfCommon {
* <p>
* Control whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
*/
- public static final String RDF_n3_usePropertySymbols = PREFIX + ".jena.n3.usePropertySymbols.b";
+ public static final String RDF_n3_disableUsePropertySymbols = PREFIX + ".jena.n3.disableUsePropertySymbols.b";
/**
- * Configuration property: N3/Turtle property: <c>useTripleQuotedStrings</c>.
+ * Configuration property: N3/Turtle property: <c>disableUseTripleQuotedStrings</c>.
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_useTripleQuotedStrings RDF_n3_useTripleQuotedStrings}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.useTripleQuotedStrings.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_disableUseTripleQuotedStrings RDF_n3_disableUseTripleQuotedStrings}
+ * <li><b>Name:</b> <js>"RdfCommon.jena.n3.disableUseTripleQuotedStrings.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.n3.useTripleQuotedStrings</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_USETRIPLEQUOTEDSTRINGS</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfCommon.jena.n3.disableUseTripleQuotedStrings</c>
+ * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_DISABLEUSETRIPLEQUOTEDSTRINGS</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_useTripleQuotedStrings()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_disableUseTripleQuotedStrings()}
* </ul>
* </ul>
*
@@ -780,22 +780,22 @@ public interface RdfCommon {
* <p>
* Allow the use of <c>"""</c> to delimit long strings.
*/
- public static final String RDF_n3_useTripleQuotedStrings = PREFIX + ".jena.n3.useTripleQuotedStrings.b";
+ public static final String RDF_n3_disableUseTripleQuotedStrings = PREFIX + ".jena.n3.disableUseTripleQuotedStrings.b";
/**
- * Configuration property: N3/Turtle property: <c>useDoubles</c>.
+ * Configuration property: N3/Turtle property: <c>disableUseDoubles</c>.
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_useDoubles RDF_n3_useDoubles}
- * <li><b>Name:</b> <js>"RdfCommon.jena.n3.useDoubles.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfCommon#RDF_n3_disableUseDoubles RDF_n3_disableUseDoubles}
+ * <li><b>Name:</b> <js>"RdfCommon.jena.n3.disableUseDoubles.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfCommon.jena.n3.useDoubles</c>
- * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_USEDOUBLES</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfCommon.jena.n3.disableUseDoubles</c>
+ * <li><b>Environment variable:</b> <c>RDFCOMMON_JENA_N3_DISABLEUSEDOUBLES</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_useDoubles()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#n3_disableUseDoubles()}
* </ul>
* </ul>
*
@@ -803,7 +803,7 @@ public interface RdfCommon {
* <p>
* Allow the use doubles as <c>123.456</c>.
*/
- public static final String RDF_n3_useDoubles = PREFIX + ".jena.n3.useDoubles.b";
+ public static final String RDF_n3_disableUseDoubles = PREFIX + ".jena.n3.disableUseDoubles.b";
/**
* Configuration property: RDF format for representing collections and arrays.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 8128c06..ebe80cb 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -95,7 +95,7 @@ public class RdfParser extends ReaderParser implements RdfCommon, RdfMetaProvide
* ReaderParser p = RdfParser
* .<jsm>create</jsm>()
* .xml()
- * .set(<jsf>RDF_trimWhitespace</jsf>, <jk>true</jk>)
+ * .set(<jsf>RDF_trimWhitespace</jsf>)
* .build();
* </p>
*/
@@ -128,8 +128,8 @@ public class RdfParser extends ReaderParser implements RdfCommon, RdfMetaProvide
*/
public RdfParser(PropertyStore ps, String...consumes) {
super(ps, consumes);
- trimWhitespace = getBooleanProperty(RDF_trimWhitespace, false);
- looseCollections = getBooleanProperty(RDF_looseCollections, false);
+ trimWhitespace = getBooleanProperty(RDF_trimWhitespace);
+ looseCollections = getBooleanProperty(RDF_looseCollections);
rdfLanguage = getStringProperty(RDF_language, "RDF/XML-ABBREV");
juneauNs = getInstanceProperty(RDF_juneauNs, Namespace.class, DEFAULT_JUNEAU_NS);
juneauBpNs = getInstanceProperty(RDF_juneauBpNs, Namespace.class, DEFAULT_JUNEAUBP_NS);
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 838bc5f..9c77cf6 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
@@ -264,21 +264,19 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
/**
- * <i><l>RdfParser</l> configuration property: </i> RDF/XML property: <c>showDoctypeDeclaration</c>.
+ * <i><l>RdfParser</l> configuration property: </i> RDF/XML property: <c>disableShowDoctypeDeclaration</c>.
*
* <p>
- * If true, an XML doctype declaration is included in the output.
+ * If disabled, an XML doctype declaration isn't included in the output.
* This declaration includes a <c>!ENTITY</c> declaration for each prefix mapping in the model, and any
* attribute value that starts with the URI of that mapping is written as starting with the corresponding entity
* invocation.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder rdfxml_showDoctypeDeclaration(boolean value) {
- return set(RDF_rdfxml_showDoctypeDeclaration, value);
+ public RdfParserBuilder rdfxml_disableShowDoctypeDeclaration() {
+ return set(RDF_rdfxml_disableShowDoctypeDeclaration);
}
/**
@@ -344,18 +342,16 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
/**
- * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>objectLists</c>.
+ * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>disableObjectLists</c>.
*
* <p>
- * Print object lists as comma separated lists.
+ * Don't print object lists as comma separated lists.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder n3_objectLists(boolean value) {
- return set(RDF_n3_objectLists, value);
+ public RdfParserBuilder n3_disableObjectLists() {
+ return set(RDF_n3_disableObjectLists);
}
/**
@@ -420,63 +416,55 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
/**
- * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>abbrevBaseURI</c>.
+ * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>disableAbbrevBaseURI</c>.
*
* <p>
- * Control whether to use abbreviations <c><></c> or <c><#></c>.
+ * Controls whether to use abbreviations <c><></c> or <c><#></c>.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder n3_abbrevBaseUri(boolean value) {
- return set(RDF_n3_abbrevBaseUri, value);
+ public RdfParserBuilder n3_disableAbbrevBaseUri() {
+ return set(RDF_n3_disableAbbrevBaseUri);
}
/**
- * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>usePropertySymbols</c>.
+ * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>disableUsePropertySymbols</c>.
*
* <p>
- * Control whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
+ * Controls whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder n3_usePropertySymbols(boolean value) {
- return set(RDF_n3_usePropertySymbols, value);
+ public RdfParserBuilder n3_disableUsePropertySymbols() {
+ return set(RDF_n3_disableUsePropertySymbols);
}
/**
- * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>useTripleQuotedStrings</c>.
+ * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>disableUseTripleQuotedStrings</c>.
*
* <p>
- * Allow the use of <c>"""</c> to delimit long strings.
+ * Disallow the use of <c>"""</c> to delimit long strings.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder n3_useTripleQuotedStrings(boolean value) {
- return set(RDF_n3_useTripleQuotedStrings, value);
+ public RdfParserBuilder n3_disableUseTripleQuotedStrings() {
+ return set(RDF_n3_disableUseTripleQuotedStrings);
}
/**
- * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>useDoubles</c>.
+ * <i><l>RdfParser</l> configuration property: </i> N3/Turtle property: <c>disableUseDoubles</c>.
*
* <p>
- * Allow the use doubles as <c>123.456</c>.
+ * Disallow the use of doubles as <c>123.456</c>.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfParserBuilder n3_useDoubles(boolean value) {
- return set(RDF_n3_useDoubles, value);
+ public RdfParserBuilder n3_disableUseDoubles() {
+ return set(RDF_n3_disableUseDoubles);
}
/**
@@ -656,7 +644,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder looseCollections() {
- return set(RDF_looseCollections, true);
+ return set(RDF_looseCollections);
}
/**
@@ -727,7 +715,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public RdfParserBuilder trimWhitespace() {
- return set(RDF_trimWhitespace, true);
+ return set(RDF_trimWhitespace);
}
/**
@@ -859,6 +847,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public RdfParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public RdfParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -876,6 +870,12 @@ public class RdfParserBuilder extends ReaderParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public RdfParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public RdfParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -919,44 +919,38 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public RdfParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public RdfParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public RdfParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public RdfParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public RdfParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public RdfParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -997,20 +991,20 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public RdfParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public RdfParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public RdfParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -1027,8 +1021,14 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public RdfParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public RdfParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -1063,14 +1063,14 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder fluentSetters() {
- super.fluentSetters();
+ public RdfParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public RdfParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 8bd6bc9..9316a1d 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
@@ -152,33 +152,32 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon, RdfMet
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfSerializer#RDF_autoDetectNamespaces RDF_autoDetectNamespaces}
- * <li><b>Name:</b> <js>"RdfSerializer.autoDetectNamespaces.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfSerializer#RDF_disableAutoDetectNamespaces RDF_disableAutoDetectNamespaces}
+ * <li><b>Name:</b> <js>"RdfSerializer.disableAutoDetectNamespaces.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>RdfSerializer.autoDetectNamespaces</c>
- * <li><b>Environment variable:</b> <c>RDFSERIALIZER_AUTODETECTNAMESPACES</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>System property:</b> <c>RdfSerializer.disableAutoDetectNamespaces</c>
+ * <li><b>Environment variable:</b> <c>RDFSERIALIZER_DISABLEAUTODETECTNAMESPACES</c>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#autoDetectNamespaces()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#disableAutoDetectNamespaces()}
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#autoDetectNamespaces(boolean)}
* <li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#disableAutoDetectNamespaces()}
* </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Detect namespace usage before serialization.
+ * Don't detect namespace usage before serialization.
*
* <p>
* If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before
* the root element is serialized.
*/
- public static final String RDF_autoDetectNamespaces = PREFIX + ".autoDetectNamespaces.b";
+ public static final String RDF_disableAutoDetectNamespaces = PREFIX + ".disableAutoDetectNamespaces.b";
/**
* Configuration property: Default namespaces.
@@ -214,29 +213,28 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon, RdfMet
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfSerializer#RDF_useXmlNamespaces RDF_useXmlNamespaces}
- * <li><b>Name:</b> <js>"Rdf.useXmlNamespaces.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.jena.RdfSerializer#RDF_disableUseXmlNamespaces RDF_disableUseXmlNamespaces}
+ * <li><b>Name:</b> <js>"Rdf.disableUseXmlNamespaces.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>Rdf.useXmlNamespaces</c>
+ * <li><b>System property:</b> <c>Rdf.disableUseXmlNamespaces</c>
* <li><b>Environment variable:</b> <c>RDFSERIALIZER_USEXMLNAMESPACES</c>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#useXmlNamespaces()}
+ * <li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig#disableUseXmlNamespaces()}
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#useXmlNamespaces(boolean)}
- * <li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#dontUseXmlNamespaces()}
+ * <li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#disableUseXmlNamespaces()}
* </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
* <p>
- * When specified, namespaces defined using {@link XmlNs @XmlNs} and {@link Xml @Xml} will be inherited by the RDF serializers.
+ * When enabled, namespaces defined using {@link XmlNs @XmlNs} and {@link Xml @Xml} will be inherited by the RDF serializers.
* <br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
*/
- public static final String RDF_useXmlNamespaces = PREFIX + ".useXmlNamespaces.b";
+ public static final String RDF_disableUseXmlNamespaces = PREFIX + ".disableUseXmlNamespaces.b";
//-------------------------------------------------------------------------------------------------------------------
// Instance
@@ -292,17 +290,17 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon, RdfMet
*/
public RdfSerializer(PropertyStore ps, String produces, String accept) {
super(ps, produces, accept);
- addLiteralTypes = getBooleanProperty(RDF_addLiteralTypes, false);
- addRootProperty = getBooleanProperty(RDF_addRootProperty, false);
- useXmlNamespaces = getBooleanProperty(RDF_useXmlNamespaces, true);
- looseCollections = getBooleanProperty(RDF_looseCollections, false);
- autoDetectNamespaces = getBooleanProperty(RDF_autoDetectNamespaces, true);
+ addLiteralTypes = getBooleanProperty(RDF_addLiteralTypes);
+ addRootProperty = getBooleanProperty(RDF_addRootProperty);
+ useXmlNamespaces = ! getBooleanProperty(RDF_disableUseXmlNamespaces);
+ looseCollections = getBooleanProperty(RDF_looseCollections);
+ autoDetectNamespaces = ! getBooleanProperty(RDF_disableAutoDetectNamespaces);
rdfLanguage = getStringProperty(RDF_language, "RDF/XML-ABBREV");
juneauNs = getProperty(RDF_juneauNs, Namespace.class, DEFAULT_JUNEAU_NS);
juneauBpNs = getProperty(RDF_juneauBpNs, Namespace.class, DEFAULT_JUNEAUBP_NS);
collectionFormat = getProperty(RDF_collectionFormat, RdfCollectionFormat.class, RdfCollectionFormat.DEFAULT);
namespaces = getProperty(RDF_namespaces, Namespace[].class, new Namespace[0]);
- addBeanTypes = getBooleanProperty(RDF_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes, false));
+ addBeanTypes = getBooleanProperty(RDF_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes));
ASortedMap<String,Object> m = ASortedMap.of();
for (String k : getPropertyKeys("RdfCommon"))
@@ -548,7 +546,7 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon, RdfMet
/**
* Auto-detect namespace usage.
*
- * @see #RDF_autoDetectNamespaces
+ * @see #RDF_disableAutoDetectNamespaces
* @return
* <jk>true</jk> if namespaces usage should be detected before serialization.
*/
@@ -570,7 +568,7 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon, RdfMet
/**
* Reuse XML namespaces when RDF namespaces not specified.
*
- * @see #RDF_useXmlNamespaces
+ * @see #RDF_disableUseXmlNamespaces
* @return
* <jk>true</jk> if namespaces defined using {@link XmlNs @XmlNs} and {@link Xml @Xml} will be inherited by the RDF serializers.
* <br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
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 cb5ecc3..f80f2fc 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
@@ -193,13 +193,11 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
* <p>
* URIs in the graph are, by default, checked prior to serialization.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder rdfxml_allowBadUris(boolean value) {
- return set(RDF_rdfxml_allowBadUris, value);
+ public RdfSerializerBuilder rdfxml_allowBadUris() {
+ return set(RDF_rdfxml_allowBadUris);
}
/**
@@ -265,21 +263,19 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> RDF/XML property: <c>showDoctypeDeclaration</c>.
+ * <i><l>RdfSerializer</l> configuration property: </i> RDF/XML property: <c>disableShowDoctypeDeclaration</c>.
*
* <p>
- * If true, an XML doctype declaration is included in the output.
+ * If disabled, an XML doctype declaration isn't included in the output.
* This declaration includes a <c>!ENTITY</c> declaration for each prefix mapping in the model, and any
* attribute value that starts with the URI of that mapping is written as starting with the corresponding entity
* invocation.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder rdfxml_showDoctypeDeclaration(boolean value) {
- return set(RDF_rdfxml_showDoctypeDeclaration, value);
+ public RdfSerializerBuilder rdfxml_disableShowDoctypeDeclaration() {
+ return set(RDF_rdfxml_disableShowDoctypeDeclaration);
}
/**
@@ -345,18 +341,16 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>objectLists</c>.
+ * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>disableObjectLists</c>.
*
* <p>
- * Print object lists as comma separated lists.
+ * Don't print object lists as comma separated lists.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder n3_objectLists(boolean value) {
- return set(RDF_n3_objectLists, value);
+ public RdfSerializerBuilder n3_disableObjectLists() {
+ return set(RDF_n3_disableObjectLists);
}
/**
@@ -421,63 +415,55 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>abbrevBaseURI</c>.
+ * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>disableAbbrevBaseURI</c>.
*
* <p>
- * Control whether to use abbreviations <c><></c> or <c><#></c>.
+ * Controls whether to use abbreviations <c><></c> or <c><#></c>.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder n3_abbrevBaseUri(boolean value) {
- return set(RDF_n3_abbrevBaseUri, value);
+ public RdfSerializerBuilder n3_disableAbbrevBaseUri() {
+ return set(RDF_n3_disableAbbrevBaseUri);
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>usePropertySymbols</c>.
+ * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>disableUsePropertySymbols</c>.
*
* <p>
- * Control whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
+ * Controls whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder n3_usePropertySymbols(boolean value) {
- return set(RDF_n3_usePropertySymbols, value);
+ public RdfSerializerBuilder n3_disableUsePropertySymbols() {
+ return set(RDF_n3_disableUsePropertySymbols);
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>useTripleQuotedStrings</c>.
+ * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>disableUseTripleQuotedStrings</c>.
*
* <p>
- * Allow the use of <c>"""</c> to delimit long strings.
+ * Disallow the use of <c>"""</c> to delimit long strings.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder n3_useTripleQuotedStrings(boolean value) {
- return set(RDF_n3_useTripleQuotedStrings, value);
+ public RdfSerializerBuilder n3_disableUseTripleQuotedStrings() {
+ return set(RDF_n3_disableUseTripleQuotedStrings);
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>useDoubles</c>.
+ * <i><l>RdfSerializer</l> configuration property: </i> N3/Turtle property: <c>disableUseDoubles</c>.
*
* <p>
- * Allow the use doubles as <c>123.456</c>.
+ * Disallow the use of doubles as <c>123.456</c>.
*
- * @param value
- * The new value for this property.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder n3_useDoubles(boolean value) {
- return set(RDF_n3_useDoubles, value);
+ public RdfSerializerBuilder n3_disableUseDoubles() {
+ return set(RDF_n3_disableUseDoubles);
}
/**
@@ -555,7 +541,7 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder addLiteralTypes() {
- return set(RDF_addLiteralTypes, true);
+ return set(RDF_addLiteralTypes);
}
/**
@@ -598,44 +584,24 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder addRootProperty() {
- return set(RDF_addRootProperty, true);
- }
-
- /**
- * <i><l>RdfSerializer</l> configuration property: </i> Auto-detect namespace usage.
- *
- * <p>
- * Detect namespace usage before serialization.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link RdfSerializer#RDF_autoDetectNamespaces}
- * </ul>
- *
- * @param value
- * The new value for this property.
- * <br>The default is <jk>true</jk>.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public RdfSerializerBuilder autoDetectNamespaces(boolean value) {
- return set(RDF_autoDetectNamespaces, value);
+ return set(RDF_addRootProperty);
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> Auto-detect namespace usage.
+ * <i><l>RdfSerializer</l> configuration property: </i> Disable auto-detect namespace usage.
*
* <p>
- * Detect namespace usage before serialization.
+ * Don't detect namespace usage before serialization.
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfSerializer#RDF_autoDetectNamespaces}
+ * <li class='jf'>{@link RdfSerializer#RDF_disableAutoDetectNamespaces}
* </ul>
*
* @return This object (for method chaining).
*/
@FluentSetter
public RdfSerializerBuilder disableAutoDetectNamespaces() {
- return set(RDF_autoDetectNamespaces, false);
+ return set(RDF_disableAutoDetectNamespaces);
}
/**
@@ -785,7 +751,7 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
*/
@FluentSetter
public RdfSerializerBuilder looseCollections() {
- return set(RDF_looseCollections, true);
+ return set(RDF_looseCollections);
}
/**
@@ -858,44 +824,22 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
/**
- * <i><l>RdfSerializer</l> configuration property: </i> Reuse XML namespaces when RDF namespaces not specified.
+ * <i><l>RdfSerializer</l> configuration property: </i> Disable reuse of XML namespaces when RDF namespaces not specified.
*
* <p>
- * When specified, namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml Xml} will be
+ * When enabled, namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml Xml} will not be
* inherited by the RDF serializers.
* Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfSerializer#RDF_useXmlNamespaces}
+ * <li class='jf'>{@link RdfSerializer#RDF_disableUseXmlNamespaces}
* </ul>
*
- * @param value
- * The new value for this property.
- * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
@FluentSetter
- public RdfSerializerBuilder useXmlNamespaces(boolean value) {
- return set(RDF_useXmlNamespaces, value);
- }
-
- /**
- * <i><l>RdfSerializer</l> configuration property: </i> Reuse XML namespaces when RDF namespaces not specified.
- *
- * <p>
- * When specified, namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml Xml} will be
- * inherited by the RDF serializers.
- * Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link RdfSerializer#RDF_useXmlNamespaces}
- * </ul>
- *
- * @return This object (for method chaining).
- */
- @FluentSetter
- public RdfSerializerBuilder dontUseXmlNamespaces() {
- return set(RDF_useXmlNamespaces, false);
+ public RdfSerializerBuilder disableUseXmlNamespaces() {
+ return set(RDF_disableUseXmlNamespaces);
}
/**
@@ -1019,6 +963,12 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public RdfSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public RdfSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -1036,6 +986,12 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public RdfSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public RdfSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -1079,44 +1035,38 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public RdfSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public RdfSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public RdfSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public RdfSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public RdfSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public RdfSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -1157,20 +1107,20 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public RdfSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public RdfSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public RdfSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -1187,8 +1137,14 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public RdfSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public RdfSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -1223,14 +1179,14 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public RdfSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RdfSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public RdfSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 10a971f..e4e4b67 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -505,7 +505,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
/**
* Configuration property: Auto-detect namespace usage.
*
- * @see RdfSerializer#RDF_autoDetectNamespaces
+ * @see RdfSerializer#RDF_disableAutoDetectNamespaces
* @return
* <jk>true</jk> if namespaces usage should be detected before serialization.
*/
@@ -527,7 +527,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
/**
* Configuration property: Reuse XML namespaces when RDF namespaces not specified.
*
- * @see RdfSerializer#RDF_useXmlNamespaces
+ * @see RdfSerializer#RDF_disableUseXmlNamespaces
* @return
* <jk>true</jk> if namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml @Xml} will be inherited by the RDF serializers.
* <br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
index 55edcfa..8e8451d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
@@ -326,10 +326,10 @@ public @interface RdfConfig {
String rdfxml_showXmlDeclaration() default "";
/**
- * Configuration property: RDF/XML property: <c>showDoctypeDeclaration</c>.
+ * Configuration property: RDF/XML property: <c>disableShowDoctypeDeclaration</c>.
*
* <p>
- * If true, an XML doctype declaration is included in the output.
+ * If true, an XML doctype declaration isn't included in the output.
* <br>This declaration includes a <c>!ENTITY</c> declaration for each prefix mapping in the model, and any
* attribute value that starts with the URI of that mapping is written as starting with the corresponding entity
* invocation.
@@ -340,10 +340,10 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfCommon#RDF_rdfxml_showDoctypeDeclaration}
+ * <li class='jf'>{@link RdfCommon#RDF_rdfxml_disableShowDoctypeDeclaration}
* </ul>
*/
- String rdfxml_showDoctypeDeclaration() default "";
+ String rdfxml_disableShowDoctypeDeclaration() default "";
/**
* Configuration property: RDF/XML property: <c>tab</c>.
@@ -416,10 +416,10 @@ public @interface RdfConfig {
String n3_minGap() default "";
/**
- * Configuration property: N3/Turtle property: <c>objectLists</c>.
+ * Configuration property: N3/Turtle property: <c>disableObjectLists</c>.
*
* <p>
- * Print object lists as comma separated lists.
+ * Don't print object lists as comma separated lists.
*
* <ul class='notes'>
* <li>
@@ -427,10 +427,10 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfCommon#RDF_n3_objectLists}
+ * <li class='jf'>{@link RdfCommon#RDF_n3_disableObjectLists}
* </ul>
*/
- String n3_objectLists() default "";
+ String n3_disableObjectLists() default "";
/**
* Configuration property: N3/Turtle property: <c>subjectColumn</c>.
@@ -502,10 +502,10 @@ public @interface RdfConfig {
String n3_widePropertyLen() default "";
/**
- * Configuration property: N3/Turtle property: <c>abbrevBaseURI</c>.
+ * Configuration property: N3/Turtle property: <c>disableAbbrevBaseURI</c>.
*
* <p>
- * Control whether to use abbreviations <c><></c> or <c><#></c>.
+ * Controls whether to use abbreviations <c><></c> or <c><#></c>.
*
* <ul class='notes'>
* <li>
@@ -513,16 +513,16 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfCommon#RDF_n3_abbrevBaseUri}
+ * <li class='jf'>{@link RdfCommon#RDF_n3_disableAbbrevBaseUri}
* </ul>
*/
- String n3_abbrevBaseUri() default "";
+ String n3_disableAbbrevBaseUri() default "";
/**
- * Configuration property: N3/Turtle property: <c>usePropertySymbols</c>.
+ * Configuration property: N3/Turtle property: <c>disableUsePropertySymbols</c>.
*
* <p>
- * Control whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
+ * Controls whether to use <c>a</c>, <c>=</c> and <c>=></c> in output
*
* <ul class='notes'>
* <li>
@@ -530,16 +530,16 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfCommon#RDF_n3_usePropertySymbols}
+ * <li class='jf'>{@link RdfCommon#RDF_n3_disableUsePropertySymbols}
* </ul>
*/
- String n3_usePropertySymbols() default "";
+ String n3_disableUsePropertySymbols() default "";
/**
- * Configuration property: N3/Turtle property: <c>useTripleQuotedStrings</c>.
+ * Configuration property: N3/Turtle property: <c>disableUseTripleQuotedStrings</c>.
*
* <p>
- * Allow the use of <c>"""</c> to delimit long strings.
+ * Disallow the use of <c>"""</c> to delimit long strings.
*
* <ul class='notes'>
* <li>
@@ -547,16 +547,16 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfCommon#RDF_n3_useTripleQuotedStrings}
+ * <li class='jf'>{@link RdfCommon#RDF_n3_disableUseTripleQuotedStrings}
* </ul>
*/
- String n3_useTripleQuotedStrings() default "";
+ String n3_disableUseTripleQuotedStrings() default "";
/**
- * Configuration property: N3/Turtle property: <c>useDoubles</c>.
+ * Configuration property: N3/Turtle property: <c>disableUseDoubles</c>.
*
* <p>
- * Allow the use doubles as <c>123.456</c>.
+ * Disallow the use doubles as <c>123.456</c>.
*
* <ul class='notes'>
* <li>
@@ -564,10 +564,10 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfCommon#RDF_n3_useDoubles}
+ * <li class='jf'>{@link RdfCommon#RDF_n3_disableUseDoubles}
* </ul>
*/
- String n3_useDoubles() default "";
+ String n3_disableUseDoubles() default "";
/**
* Configuration property: RDF format for representing collections and arrays.
@@ -711,13 +711,13 @@ public @interface RdfConfig {
String addRootProperty() default "";
/**
- * Configuration property: Auto-detect namespace usage.
+ * Configuration property: Disable auto-detect namespace usage.
*
* <p>
- * Detect namespace usage before serialization.
+ * Don't detect namespace usage before serialization.
*
* <p>
- * If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before
+ * If disabled, then the data structure will first be crawled looking for namespaces that will be encountered before
* the root element is serialized.
*
* <ul class='notes'>
@@ -726,10 +726,10 @@ public @interface RdfConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfSerializer#RDF_autoDetectNamespaces}
+ * <li class='jf'>{@link RdfSerializer#RDF_disableAutoDetectNamespaces}
* </ul>
*/
- String autoDetectNamespaces() default "";
+ String disableAutoDetectNamespaces() default "";
/**
* Configuration property: Default namespaces.
@@ -749,7 +749,7 @@ public @interface RdfConfig {
String[] namespaces() default {};
/**
- * Configuration property: Reuse XML namespaces when RDF namespaces not specified.
+ * Configuration property: Disable reuse of XML namespaces when RDF namespaces not specified.
*
* <p>
* When specified, namespaces defined using {@link XmlNs @XmlNs} and {@link Xml @Xml} will be inherited by the RDF serializers.
@@ -759,16 +759,16 @@ public @interface RdfConfig {
* <li>
* Possible values:
* <ul>
- * <li><js>"true"</js> (default)
- * <li><js>"false"</js>
+ * <li><js>"true"</js>
+ * <li><js>"false"</js> (default)
* </ul>
* <li>
* Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link RdfSerializer#RDF_useXmlNamespaces}
+ * <li class='jf'>{@link RdfSerializer#RDF_disableUseXmlNamespaces}
* </ul>
*/
- String useXmlNamespaces() default "";
+ String disableUseXmlNamespaces() default "";
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 68188df..335d5e0 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -49,8 +49,8 @@ public class RdfConfigAnnotation {
psb.set(RDF_juneauNs, string(a.juneauNs()));
if (! a.juneauBpNs().isEmpty())
psb.set(RDF_juneauBpNs, string(a.juneauBpNs()));
- if (! a.useXmlNamespaces().isEmpty())
- psb.set(RDF_useXmlNamespaces, bool(a.useXmlNamespaces()));
+ if (! a.disableUseXmlNamespaces().isEmpty())
+ psb.set(RDF_disableUseXmlNamespaces, bool(a.disableUseXmlNamespaces()));
if (! a.arp_iriRules().isEmpty())
psb.set(RDF_arp_iriRules, string(a.arp_iriRules()));
if (! a.arp_errorMode().isEmpty())
@@ -67,8 +67,8 @@ public class RdfConfigAnnotation {
psb.set(RDF_rdfxml_relativeUris, string(a.rdfxml_relativeUris()));
if (! a.rdfxml_showXmlDeclaration().isEmpty())
psb.set(RDF_rdfxml_showXmlDeclaration, string(a.rdfxml_showXmlDeclaration()));
- if (! a.rdfxml_showDoctypeDeclaration().isEmpty())
- psb.set(RDF_rdfxml_showDoctypeDeclaration, bool(a.rdfxml_showDoctypeDeclaration()));
+ if (! a.rdfxml_disableShowDoctypeDeclaration().isEmpty())
+ psb.set(RDF_rdfxml_disableShowDoctypeDeclaration, bool(a.rdfxml_disableShowDoctypeDeclaration()));
if (! a.rdfxml_tab().isEmpty())
psb.set(RDF_rdfxml_tab, integer(a.rdfxml_tab(), "rdfxml_tab"));
if (! a.rdfxml_attributeQuoteChar().isEmpty())
@@ -77,8 +77,8 @@ public class RdfConfigAnnotation {
psb.set(RDF_rdfxml_blockRules, string(a.rdfxml_blockRules()));
if (! a.n3_minGap().isEmpty())
psb.set(RDF_n3_minGap, integer(a.n3_minGap(), "n3_minGap"));
- if (! a.n3_objectLists().isEmpty())
- psb.set(RDF_n3_objectLists, bool(a.n3_objectLists()));
+ if (! a.n3_disableObjectLists().isEmpty())
+ psb.set(RDF_n3_disableObjectLists, bool(a.n3_disableObjectLists()));
if (! a.n3_subjectColumn().isEmpty())
psb.set(RDF_n3_subjectColumn, integer(a.n3_subjectColumn(), "n3_subjectColumn"));
if (! a.n3_propertyColumn().isEmpty())
@@ -87,14 +87,14 @@ public class RdfConfigAnnotation {
psb.set(RDF_n3_indentProperty, integer(a.n3_indentProperty(), "n3_indentProperty"));
if (! a.n3_widePropertyLen().isEmpty())
psb.set(RDF_n3_widePropertyLen, integer(a.n3_widePropertyLen(), "n3_widePropertyLen"));
- if (! a.n3_abbrevBaseUri().isEmpty())
- psb.set(RDF_n3_abbrevBaseUri, bool(a.n3_abbrevBaseUri()));
- if (! a.n3_usePropertySymbols().isEmpty())
- psb.set(RDF_n3_usePropertySymbols, bool(a.n3_usePropertySymbols()));
- if (! a.n3_useTripleQuotedStrings().isEmpty())
- psb.set(RDF_n3_useTripleQuotedStrings, bool(a.n3_useTripleQuotedStrings()));
- if (! a.n3_useDoubles().isEmpty())
- psb.set(RDF_n3_useDoubles, bool(a.n3_useDoubles()));
+ if (! a.n3_disableAbbrevBaseUri().isEmpty())
+ psb.set(RDF_n3_disableAbbrevBaseUri, bool(a.n3_disableAbbrevBaseUri()));
+ if (! a.n3_disableUsePropertySymbols().isEmpty())
+ psb.set(RDF_n3_disableUsePropertySymbols, bool(a.n3_disableUsePropertySymbols()));
+ if (! a.n3_disableUseTripleQuotedStrings().isEmpty())
+ psb.set(RDF_n3_disableUseTripleQuotedStrings, bool(a.n3_disableUseTripleQuotedStrings()));
+ if (! a.n3_disableUseDoubles().isEmpty())
+ psb.set(RDF_n3_disableUseDoubles, bool(a.n3_disableUseDoubles()));
if (! a.collectionFormat().isEmpty())
psb.set(RDF_collectionFormat, string(a.collectionFormat()));
if (! a.looseCollections().isEmpty())
@@ -106,8 +106,8 @@ public class RdfConfigAnnotation {
psb.set(RDF_addLiteralTypes, bool(a.addLiteralTypes()));
if (! a.addRootProperty().isEmpty())
psb.set(RDF_addRootProperty, bool(a.addRootProperty()));
- if (! a.autoDetectNamespaces().isEmpty())
- psb.set(RDF_autoDetectNamespaces, bool(a.autoDetectNamespaces()));
+ if (! a.disableAutoDetectNamespaces().isEmpty())
+ psb.set(RDF_disableAutoDetectNamespaces, bool(a.disableAutoDetectNamespaces()));
if (a.namespaces().length > 0)
psb.set(RDF_namespaces, strings(a.namespaces()));
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 298f57d..0c213a2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -96,7 +96,7 @@ import org.apache.juneau.utils.*;
* <jc>// Construct a context from scratch.</jc>
* BeanContext beanContext = BeanContext
* .<jsm>create</jsm>()
- * .set(BeanContext.<jsf>BEAN_beansRequireDefaultConstructor</jsf>, <jk>true</jk>)
+ * .set(BeanContext.<jsf>BEAN_beansRequireDefaultConstructor</jsf>)
* .notBeanClasses(Foo.<jk>class</jk>)
* .build();
* </p>
@@ -612,7 +612,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableBeansRequireSomeProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableBeansRequireSomeProperties</jsf>)
* .build();
*
* <jc>// Produces: {}</jc>
@@ -740,7 +740,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>)
* .build();
*
* BeanMap<MyBean> bm = s.createSession().toBeanMap(<jk>new</jk> MyBean());
@@ -868,7 +868,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beansRequireDefaultConstructor</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beansRequireDefaultConstructor</jsf>)
* .build();
*
* <jc>// Produces: "bar"</jc>
@@ -933,7 +933,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beansRequireSerializable</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beansRequireSerializable</jsf>)
* .build();
*
* <jc>// Produces: "bar"</jc>
@@ -996,7 +996,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beansRequireSettersForGetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beansRequireSettersForGetters</jsf>)
* .build();
*
* <jc>// Produces: {"foo":"foo"}</jc>
@@ -1120,7 +1120,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableIgnoreTransientFields</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableIgnoreTransientFields</jsf>)
* .build();
*
* <jc>// Produces: {"foo":"foo"}</jc>
@@ -1177,7 +1177,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableIgnoreUnknownNullBeanProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableIgnoreUnknownNullBeanProperties</jsf>)
* .build();
*
* <jc>// Throws a BeanRuntimeException wrapped in a ParseException on the unknown 'bar' property.</jc>
@@ -1191,20 +1191,20 @@ public class BeanContext extends Context implements MetaProvider {
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.BeanContext#BEAN_disableSilentlyIgnoreMissingSetters BEAN_disableSilentlyIgnoreMissingSetters}
- * <li><b>Name:</b> <js>"BeanContext.disableSilentlyIgnoreMissingSetters.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.BeanContext#BEAN_disableIgnoreMissingSetters BEAN_disableIgnoreMissingSetters}
+ * <li><b>Name:</b> <js>"BeanContext.disableIgnoreMissingSetters.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>BeanContext.disableSilentlyIgnoreMissingSetters</c>
- * <li><b>Environment variable:</b> <c>BEANCONTEXT_DISABLESILENTLYIGNOREMISSINGSETTERS</c>
+ * <li><b>System property:</b> <c>BeanContext.disableIgnoreMissingSetters</c>
+ * <li><b>Environment variable:</b> <c>BEANCONTEXT_DISABLEIGNOREMISSINGSETTERS</c>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableSilentlyIgnoreMissingSetters()}
+ * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableIgnoreMissingSetters()}
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.BeanContextBuilder#disableSilentlyIgnoreMissingSetters()}
+ * <li class='jm'>{@link org.apache.juneau.BeanContextBuilder#disableIgnoreMissingSetters()}
* </ul>
* </ul>
*
@@ -1226,13 +1226,13 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Create a parser that throws an exception if a setter is not found but a getter is.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .disableSilentlyIgnoreMissingSetters()
+ * .disableIgnoreMissingSetters()
* .build();
*
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableSilentlyIgnoreMissingSetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableIgnoreMissingSetters</jsf>)
* .build();
*
* <jc>// Throws a ParseException.</jc>
@@ -1243,7 +1243,7 @@ public class BeanContext extends Context implements MetaProvider {
* <li>The {@link BeanIgnore @BeanIgnore} annotation can also be used on getters and fields to ignore them.
* </ul>
*/
- public static final String BEAN_disableSilentlyIgnoreMissingSetters = PREFIX + ".disableSilentlyIgnoreMissingSetters.b";
+ public static final String BEAN_disableIgnoreMissingSetters = PREFIX + ".disableIgnoreMissingSetters.b";
/**
* Configuration property: Don't use interface proxies.
@@ -1281,21 +1281,21 @@ public class BeanContext extends Context implements MetaProvider {
*
* <h5 class='section'>Property:</h5>
* <ul class='spaced-list'>
- * <li><b>ID:</b> {@link org.apache.juneau.BeanContext#BEAN_fluentSetters BEAN_fluentSetters}
- * <li><b>Name:</b> <js>"BeanContext.fluentSetters.b"</js>
+ * <li><b>ID:</b> {@link org.apache.juneau.BeanContext#BEAN_findFluentSetters BEAN_findFluentSetters}
+ * <li><b>Name:</b> <js>"BeanContext.findFluentSetters.b"</js>
* <li><b>Data type:</b> <jk>boolean</jk>
- * <li><b>System property:</b> <c>BeanContext.fluentSetters</c>
- * <li><b>Environment variable:</b> <c>BEANCONTEXT_FLUENTSETTERS</c>
+ * <li><b>System property:</b> <c>BeanContext.findFluentSetters</c>
+ * <li><b>Environment variable:</b> <c>BEANCONTEXT_FINDFLUENTSETTERS</c>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.annotation.Bean#fluentSetters()}
- * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#fluentSetters()}
+ * <li class='ja'>{@link org.apache.juneau.annotation.Bean#findFluentSetters()}
+ * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#findFluentSetters()}
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.BeanContextBuilder#fluentSetters()}
+ * <li class='jm'>{@link org.apache.juneau.BeanContextBuilder#findFluentSetters()}
* </ul>
* </ul>
*
@@ -1323,13 +1323,13 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Create a parser that finds fluent setters.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .fluentSetters()
+ * .findFluentSetters()
* .build();
*
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_fluentSetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_findFluentSetters</jsf>)
* .build();
*
* <jc>// Parse into bean using fluent setter.</jc>
@@ -1338,10 +1338,10 @@ public class BeanContext extends Context implements MetaProvider {
*
* <ul class='notes'>
* <li>The {@link Beanp @Beanp} annotation can also be used on methods to individually identify them as fluent setters.
- * <li>The {@link Bean#fluentSetters() @Bean.fluentSetters()} annotation can also be used on classes to specify to look for fluent setters.
+ * <li>The {@link Bean#findFluentSetters() @Bean.findFluentSetters()} annotation can also be used on classes to specify to look for fluent setters.
* </ul>
*/
- public static final String BEAN_fluentSetters = PREFIX + ".fluentSetters.b";
+ public static final String BEAN_findFluentSetters = PREFIX + ".findFluentSetters.b";
/**
* Configuration property: Ignore invocation errors on getters.
@@ -1389,7 +1389,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>)
* .build();
*
* <jc>// Exception is ignored.</jc>
@@ -1444,7 +1444,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>)
* .build();
*
* <jc>// Exception is ignored.</jc>
@@ -1497,7 +1497,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>)
* .build();
*
* <jc>// Doesn't throw an exception on unknown 'bar' property.</jc>
@@ -1753,7 +1753,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_sortProperties</jsf>)
* .build();
*
* <jc>// Produces: {"a":"3","b":"2","c":"1"}</jc>
@@ -1912,7 +1912,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_useEnumNames</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_useEnumNames</jsf>)
* .build();
*
* <jc>// Enum with overridden toString().</jc>
@@ -1976,7 +1976,7 @@ public class BeanContext extends Context implements MetaProvider {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_useJavaBeanIntrospector</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_useJavaBeanIntrospector</jsf>)
* .build();
* </p>
*/
@@ -2035,14 +2035,14 @@ public class BeanContext extends Context implements MetaProvider {
useInterfaceProxies,
ignoreUnknownBeanProperties,
ignoreUnknownNullBeanProperties,
- silentlyIgnoreMissingSetters,
+ ignoreMissingSetters,
ignoreTransientFields,
ignoreInvocationExceptionsOnGetters,
ignoreInvocationExceptionsOnSetters,
useJavaBeanIntrospector,
useEnumNames,
sortProperties,
- fluentSetters;
+ findFluentSetters;
private final Visibility
beanConstructorVisibility,
@@ -2109,22 +2109,22 @@ public class BeanContext extends Context implements MetaProvider {
}
this.annotations = rmb.build();
- beansRequireDefaultConstructor = getBooleanProperty(BEAN_beansRequireDefaultConstructor, false);
- beansRequireSerializable = getBooleanProperty(BEAN_beansRequireSerializable, false);
- beansRequireSettersForGetters = getBooleanProperty(BEAN_beansRequireSettersForGetters, false);
- beansRequireSomeProperties = ! getBooleanProperty(BEAN_disableBeansRequireSomeProperties, false);
- beanMapPutReturnsOldValue = getBooleanProperty(BEAN_beanMapPutReturnsOldValue, false);
- useEnumNames = getBooleanProperty(BEAN_useEnumNames, false);
- useInterfaceProxies = ! getBooleanProperty(BEAN_disableInterfaceProxies, false);
- ignoreUnknownBeanProperties = getBooleanProperty(BEAN_ignoreUnknownBeanProperties, false);
- ignoreUnknownNullBeanProperties = ! getBooleanProperty(BEAN_disableIgnoreUnknownNullBeanProperties, false);
- silentlyIgnoreMissingSetters = ! getBooleanProperty(BEAN_disableSilentlyIgnoreMissingSetters, false);
- ignoreTransientFields = ! getBooleanProperty(BEAN_disableIgnoreTransientFields, false);
- ignoreInvocationExceptionsOnGetters = getBooleanProperty(BEAN_ignoreInvocationExceptionsOnGetters, false);
- ignoreInvocationExceptionsOnSetters = getBooleanProperty(BEAN_ignoreInvocationExceptionsOnSetters, false);
- useJavaBeanIntrospector = getBooleanProperty(BEAN_useJavaBeanIntrospector, false);
- sortProperties = getBooleanProperty(BEAN_sortProperties, false);
- fluentSetters = getBooleanProperty(BEAN_fluentSetters, false);
+ beansRequireDefaultConstructor = getBooleanProperty(BEAN_beansRequireDefaultConstructor);
+ beansRequireSerializable = getBooleanProperty(BEAN_beansRequireSerializable);
+ beansRequireSettersForGetters = getBooleanProperty(BEAN_beansRequireSettersForGetters);
+ beansRequireSomeProperties = ! getBooleanProperty(BEAN_disableBeansRequireSomeProperties);
+ beanMapPutReturnsOldValue = getBooleanProperty(BEAN_beanMapPutReturnsOldValue);
+ useEnumNames = getBooleanProperty(BEAN_useEnumNames);
+ useInterfaceProxies = ! getBooleanProperty(BEAN_disableInterfaceProxies);
+ ignoreUnknownBeanProperties = getBooleanProperty(BEAN_ignoreUnknownBeanProperties);
+ ignoreUnknownNullBeanProperties = ! getBooleanProperty(BEAN_disableIgnoreUnknownNullBeanProperties);
+ ignoreMissingSetters = ! getBooleanProperty(BEAN_disableIgnoreMissingSetters);
+ ignoreTransientFields = ! getBooleanProperty(BEAN_disableIgnoreTransientFields);
+ ignoreInvocationExceptionsOnGetters = getBooleanProperty(BEAN_ignoreInvocationExceptionsOnGetters);
+ ignoreInvocationExceptionsOnSetters = getBooleanProperty(BEAN_ignoreInvocationExceptionsOnSetters);
+ useJavaBeanIntrospector = getBooleanProperty(BEAN_useJavaBeanIntrospector);
+ sortProperties = getBooleanProperty(BEAN_sortProperties);
+ findFluentSetters = getBooleanProperty(BEAN_findFluentSetters);
typePropertyName = getStringProperty(BEAN_typePropertyName, "_type");
beanConstructorVisibility = getProperty(BEAN_beanConstructorVisibility, Visibility.class, PUBLIC);
@@ -3339,12 +3339,12 @@ public class BeanContext extends Context implements MetaProvider {
* <h5 class='section'>Description:</h5>
* <p>
*
- * @see #BEAN_fluentSetters
+ * @see #BEAN_findFluentSetters
* @return
* <jk>true</jk> if fluent setters are detected on beans.
*/
- public final boolean isFluentSetters() {
- return fluentSetters;
+ public final boolean isFindFluentSetters() {
+ return findFluentSetters;
}
/**
@@ -3372,12 +3372,12 @@ public class BeanContext extends Context implements MetaProvider {
/**
* Silently ignore missing setters.
*
- * @see #BEAN_disableSilentlyIgnoreMissingSetters
+ * @see #BEAN_disableIgnoreMissingSetters
* @return
* <jk>true</jk> if trying to set a value on a bean property without a setter should throw a {@link BeanRuntimeException}.
*/
- public final boolean isSilentlyIgnoreMissingSetters() {
- return silentlyIgnoreMissingSetters;
+ public final boolean isIgnoreMissingSetters() {
+ return ignoreMissingSetters;
}
/**
@@ -3524,7 +3524,7 @@ public class BeanContext extends Context implements MetaProvider {
if (beanToStringSerializer == null) {
if (JsonSerializer.DEFAULT == null)
return null;
- this.beanToStringSerializer = JsonSerializer.create().apply(this.getPropertyStore()).sq().simple().build();
+ this.beanToStringSerializer = JsonSerializer.create().apply(this.getPropertyStore()).sq().simpleMode().build();
}
return beanToStringSerializer;
}
@@ -3548,7 +3548,7 @@ public class BeanContext extends Context implements MetaProvider {
.a("beansRequireSettersForGetters", beansRequireSettersForGetters)
.a("beansRequireSomeProperties", beansRequireSomeProperties)
.a("ignoreTransientFields", ignoreTransientFields)
- .a("silentlyIgnoreMissingSetters", silentlyIgnoreMissingSetters)
+ .a("ignoreMissingSetters", ignoreMissingSetters)
.a("ignoreInvocationExceptionsOnGetters", ignoreInvocationExceptionsOnGetters)
.a("ignoreInvocationExceptionsOnSetters", ignoreInvocationExceptionsOnSetters)
.a("ignoreUnknownBeanProperties", ignoreUnknownBeanProperties)
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 14e1765..ca5b53e 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
@@ -41,8 +41,8 @@ import org.apache.juneau.transform.*;
* <p class='bcode w800'>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>JSON_simpleMode</jsf>, <jk>true</jk>)
- * .set(<jsf>SERIALIZER_useWhitespace</jsf>, <jk>true</jk>)
+ * .set(<jsf>JSON_simpleMode</jsf>)
+ * .set(<jsf>SERIALIZER_useWhitespace</jsf>)
* .set(<jsf>SERIALIZER_quoteChar</jsf>, <js>"'"</js>)
* .build();
* </p>
@@ -520,7 +520,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>)
* .build();
*
* BeanMap<MyBean> bm = s.createSession().toBeanMap(<jk>new</jk> MyBean());
@@ -536,7 +536,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder beanMapPutReturnsOldValue() {
- return set(BEAN_beanMapPutReturnsOldValue, true);
+ return set(BEAN_beanMapPutReturnsOldValue);
}
/**
@@ -627,7 +627,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beansRequireDefaultConstructor</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beansRequireDefaultConstructor</jsf>)
* .build();
*
* <jc>// Produces: "bar"</jc>
@@ -647,7 +647,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder beansRequireDefaultConstructor() {
- return set(BEAN_beansRequireDefaultConstructor, true);
+ return set(BEAN_beansRequireDefaultConstructor);
}
/**
@@ -680,7 +680,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beansRequireSerializable</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beansRequireSerializable</jsf>)
* .build();
*
* <jc>// Produces: "bar"</jc>
@@ -700,7 +700,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder beansRequireSerializable() {
- return set(BEAN_beansRequireSerializable, true);
+ return set(BEAN_beansRequireSerializable);
}
/**
@@ -731,7 +731,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_beansRequireSettersForGetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_beansRequireSettersForGetters</jsf>)
* .build();
*
* <jc>// Produces: {"foo":"foo"}</jc>
@@ -751,7 +751,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder beansRequireSettersForGetters() {
- return set(BEAN_beansRequireSettersForGetters, true);
+ return set(BEAN_beansRequireSettersForGetters);
}
/**
@@ -779,7 +779,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableBeansRequireSomeProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableBeansRequireSomeProperties</jsf>)
* .build();
*
* <jc>// Produces: {}</jc>
@@ -799,7 +799,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder disableBeansRequireSomeProperties() {
- return set(BEAN_disableBeansRequireSomeProperties, true);
+ return set(BEAN_disableBeansRequireSomeProperties);
}
/**
@@ -1534,7 +1534,7 @@ public class BeanContextBuilder extends ContextBuilder {
* .<jsm>create</jsm>()
* .addTo(<jsf>BEAN_beanDictionary</jsf>, Foo.<jk>class</jk>)
* .addTo(<jsf>BEAN_beanDictionary</jsf>, Bar.<jk>class</jk>)
- * .set(<jsf>SERIALIZER_addBeanTypes</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_addBeanTypes</jsf>)
* .build();
*
* <jc>// A bean with a field with an indeterminate type.</jc>
@@ -1755,13 +1755,13 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Create a parser that finds fluent setters.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .fluentSetters()
+ * .findFluentSetters()
* .build();
*
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_fluentSetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_findFluentSetters</jsf>)
* .build();
*
* <jc>// Parse into bean using fluent setter.</jc>
@@ -1770,25 +1770,25 @@ public class BeanContextBuilder extends ContextBuilder {
*
* <ul class='notes'>
* <li>The {@link Beanp @Beanp} annotation can also be used on methods to individually identify them as fluent setters.
- * <li>The {@link Bean#fluentSetters() @Bean.fluentSetters()} annotation can also be used on classes to specify to look for fluent setters.
+ * <li>The {@link Bean#findFluentSetters() @Bean.fluentSetters()} annotation can also be used on classes to specify to look for fluent setters.
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_fluentSetters}
+ * <li class='jf'>{@link BeanContext#BEAN_findFluentSetters}
* </ul>
*
* @return This object (for method chaining).
*/
@FluentSetter
- public BeanContextBuilder fluentSetters() {
- return set(BEAN_fluentSetters, true);
+ public BeanContextBuilder findFluentSetters() {
+ return set(BEAN_findFluentSetters);
}
/**
* <i><l>BeanContext</l> configuration property: </i> Find fluent setters.
*
* <p>
- * Identical to {@link #fluentSetters()} but enables it on a specific class only.
+ * Identical to {@link #findFluentSetters()} but enables it on a specific class only.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
@@ -1800,7 +1800,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Create a parser that finds fluent setters.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .fluentSetters(MyBean.<jk>class</jk>)
+ * .findFluentSetters(MyBean.<jk>class</jk>)
* .build();
*
* <jc>// Parse into bean using fluent setter.</jc>
@@ -1808,20 +1808,20 @@ public class BeanContextBuilder extends ContextBuilder {
* </p>
*
* <ul class='notes'>
- * <li>This method is functionally equivalent to using the {@link Bean#fluentSetters()} annotation.
+ * <li>This method is functionally equivalent to using the {@link Bean#findFluentSetters()} annotation.
* </ul>
*
* <ul class='seealso'>
- * <li class='ja'>{@link Bean#fluentSetters()}
- * <li class='jf'>{@link BeanContext#BEAN_fluentSetters}
+ * <li class='ja'>{@link Bean#findFluentSetters()}
+ * <li class='jf'>{@link BeanContext#BEAN_findFluentSetters}
* </ul>
*
* @param on The class that this applies to.
* @return This object (for method chaining).
*/
@FluentSetter
- public BeanContextBuilder fluentSetters(Class<?> on) {
- return prependTo(BEAN_annotations, BeanAnnotation.create(on).fluentSetters(true).build());
+ public BeanContextBuilder findFluentSetters(Class<?> on) {
+ return prependTo(BEAN_annotations, BeanAnnotation.create(on).findFluentSetters(true).build());
}
/**
@@ -1849,7 +1849,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>)
* .build();
*
* <jc>// Exception is ignored.</jc>
@@ -1864,7 +1864,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder ignoreInvocationExceptionsOnGetters() {
- return set(BEAN_ignoreInvocationExceptionsOnGetters, true);
+ return set(BEAN_ignoreInvocationExceptionsOnGetters);
}
/**
@@ -1892,7 +1892,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>)
* .build();
*
* <jc>// Exception is ignored.</jc>
@@ -1907,7 +1907,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder ignoreInvocationExceptionsOnSetters() {
- return set(BEAN_ignoreInvocationExceptionsOnSetters, true);
+ return set(BEAN_ignoreInvocationExceptionsOnSetters);
}
/**
@@ -1929,13 +1929,13 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Create a parser that throws an exception if a setter is not found but a getter is.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .disableSilentlyIgnoreMissingSetters()
+ * .disableIgnoreMissingSetters()
* .build();
*
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableSilentlyIgnoreMissingSetters</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableIgnoreMissingSetters</jsf>)
* .build();
*
* <jc>// Throws a ParseException.</jc>
@@ -1947,14 +1947,14 @@ public class BeanContextBuilder extends ContextBuilder {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_disableSilentlyIgnoreMissingSetters}
+ * <li class='jf'>{@link BeanContext#BEAN_disableIgnoreMissingSetters}
* </ul>
*
* @return This object (for method chaining).
*/
@FluentSetter
- public BeanContextBuilder disableSilentlyIgnoreMissingSetters() {
- return set(BEAN_disableSilentlyIgnoreMissingSetters, true);
+ public BeanContextBuilder disableIgnoreMissingSetters() {
+ return set(BEAN_disableIgnoreMissingSetters);
}
/**
@@ -1979,7 +1979,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableIgnoreTransientFields</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableIgnoreTransientFields</jsf>)
* .build();
*
* <jc>// Produces: {"foo":"foo"}</jc>
@@ -1998,7 +1998,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder disableIgnoreTransientFields() {
- return set(BEAN_disableIgnoreTransientFields, true);
+ return set(BEAN_disableIgnoreTransientFields);
}
/**
@@ -2024,7 +2024,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>)
* .build();
*
* <jc>// Doesn't throw an exception on unknown 'bar' property.</jc>
@@ -2039,7 +2039,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder ignoreUnknownBeanProperties() {
- return set(BEAN_ignoreUnknownBeanProperties, true);
+ return set(BEAN_ignoreUnknownBeanProperties);
}
/**
@@ -2065,7 +2065,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_disableIgnoreUnknownNullBeanProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_disableIgnoreUnknownNullBeanProperties</jsf>)
* .build();
*
* <jc>// Throws a BeanRuntimeException wrapped in a ParseException on the unknown 'bar' property.</jc>
@@ -2080,7 +2080,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder disableIgnoreUnknownNullBeanProperties() {
- return set(BEAN_disableIgnoreUnknownNullBeanProperties, true);
+ return set(BEAN_disableIgnoreUnknownNullBeanProperties);
}
/**
@@ -2520,7 +2520,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_sortProperties</jsf>)
* .build();
*
* <jc>// Produces: {"a":"3","b":"2","c":"1"}</jc>
@@ -2539,7 +2539,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder sortProperties() {
- return set(BEAN_sortProperties, true);
+ return set(BEAN_sortProperties);
}
/**
@@ -2885,7 +2885,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_useEnumNames</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_useEnumNames</jsf>)
* .build();
*
* <jc>// Enum with overridden toString().</jc>
@@ -2916,7 +2916,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder useEnumNames() {
- return set(BEAN_useEnumNames, true);
+ return set(BEAN_useEnumNames);
}
/**
@@ -2935,7 +2935,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder disableInterfaceProxies() {
- return set(BEAN_disableInterfaceProxies, true);
+ return set(BEAN_disableInterfaceProxies);
}
/**
@@ -2956,7 +2956,7 @@ public class BeanContextBuilder extends ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_useJavaBeanIntrospector</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_useJavaBeanIntrospector</jsf>)
* .build();
* </p>
*
@@ -2968,7 +2968,7 @@ public class BeanContextBuilder extends ContextBuilder {
*/
@FluentSetter
public BeanContextBuilder useJavaBeanIntrospector() {
- return set(BEAN_useJavaBeanIntrospector, true);
+ return set(BEAN_useJavaBeanIntrospector);
}
// <FluentSetters>
@@ -3058,6 +3058,12 @@ public class BeanContextBuilder extends ContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public BeanContextBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public BeanContextBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -3075,5 +3081,11 @@ public class BeanContextBuilder extends ContextBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public BeanContextBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
// </FluentSetters>
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilterBuilder.java
index 6952ff5..abbbc86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilterBuilder.java
@@ -70,8 +70,8 @@ public class BeanFilterBuilder {
if (b.sort())
sortProperties(true);
- if (b.fluentSetters())
- fluentSetters(true);
+ if (b.findFluentSetters())
+ findFluentSetters();
if (! (b.excludeProperties().isEmpty() && b.xp().isEmpty()))
excludeProperties(b.excludeProperties(), b.xp());
@@ -345,40 +345,19 @@ public class BeanFilterBuilder {
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> BeanFilterBuilder<MyBean> {
* <jk>public</jk> MyFilter() {
- * fluentSetters();
+ * findFluentSetters();
* }
* }
* </p>
*
* <ul class='seealso'>
- * <li class='ja'>{@link Bean#fluentSetters()}
- * <li class='jf'>{@link BeanContext#BEAN_fluentSetters}
- * </ul>
- *
- * @param value
- * The new value for this property.
- * <br>The default is <jk>false</jk>.
- * @return This object (for method chaining).
- */
- public BeanFilterBuilder fluentSetters(boolean value) {
- this.fluentSetters = value;
- return this;
- }
-
- /**
- * Configuration property: Find fluent setters.
- *
- * <p>
- * Shortcut for calling <code>fluentSetters(<jk>true</jk>)</code>.
- *
- * <ul class='seealso'>
- * <li class='ja'>{@link Bean#fluentSetters()}
- * <li class='jf'>{@link BeanContext#BEAN_fluentSetters}
+ * <li class='ja'>{@link Bean#findFluentSetters()}
+ * <li class='jf'>{@link BeanContext#BEAN_findFluentSetters}
* </ul>
*
* @return This object (for method chaining).
*/
- public BeanFilterBuilder fluentSetters() {
+ public BeanFilterBuilder findFluentSetters() {
this.fluentSetters = true;
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index a682d4c..b861236 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -190,7 +190,7 @@ public class BeanMeta<T> {
if (typePropertyName == null)
typePropertyName = ctx.getBeanTypePropertyName();
- fluentSetters = (ctx.isFluentSetters() || (beanFilter != null && beanFilter.isFluentSetters()));
+ fluentSetters = (ctx.isFindFluentSetters() || (beanFilter != null && beanFilter.isFluentSetters()));
// If @Bean.interfaceClass is specified on the parent class, then we want
// to use the properties defined on that class, not the subclass.
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 6fd9a30..e4e4f3f 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
@@ -682,7 +682,7 @@ public final class BeanPropertyMeta {
boolean isCollection = rawTypeMeta.isCollection();
if ((! isDyna) && field == null && setter == null && ! (isMap || isCollection)) {
- if ((value == null && beanContext.isIgnoreUnknownNullBeanProperties()) || beanContext.isSilentlyIgnoreMissingSetters())
+ if ((value == null && beanContext.isIgnoreUnknownNullBeanProperties()) || beanContext.isIgnoreMissingSetters())
return null;
throw new BeanRuntimeException(beanMeta.c, "Setter or public field not defined on property ''{0}''", name);
}
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 f68a66d..bf52a26 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
@@ -1303,12 +1303,12 @@ public class BeanSession extends Session {
* <h5 class='section'>Description:</h5>
* <p>
*
- * @see BeanContext#BEAN_fluentSetters
+ * @see BeanContext#BEAN_findFluentSetters
* @return
* <jk>true</jk> if fluent setters are detected on beans.
*/
- public final boolean isFluentSetters() {
- return ctx.isFluentSetters();
+ public final boolean isFindFluentSetters() {
+ return ctx.isFindFluentSetters();
}
/**
@@ -1336,12 +1336,12 @@ public class BeanSession extends Session {
/**
* Configuration property: Silently ignore missing setters.
*
- * @see BeanContext#BEAN_disableSilentlyIgnoreMissingSetters
+ * @see BeanContext#BEAN_disableIgnoreMissingSetters
* @return
* <jk>true</jk> if trying to set a value on a bean property without a setter should throw a {@link BeanRuntimeException}.
*/
- public final boolean isSilentlyIgnoreMissingSetters() {
- return ctx.isSilentlyIgnoreMissingSetters();
+ public final boolean isIgnoreMissingSetters() {
+ return ctx.isIgnoreMissingSetters();
}
/**
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 36e8ab1..a287d13 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
@@ -91,7 +91,7 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
*/
@FluentSetter
public BeanTraverseBuilder detectRecursions() {
- return set(BEANTRAVERSE_detectRecursions, true);
+ return set(BEANTRAVERSE_detectRecursions);
}
/**
@@ -140,7 +140,7 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
*/
@FluentSetter
public BeanTraverseBuilder ignoreRecursions() {
- return set(BEANTRAVERSE_ignoreRecursions, true);
+ return set(BEANTRAVERSE_ignoreRecursions);
}
/**
@@ -301,6 +301,12 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public BeanTraverseBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public BeanTraverseBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -318,6 +324,12 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public BeanTraverseBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public BeanTraverseBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -361,44 +373,38 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public BeanTraverseBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public BeanTraverseBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public BeanTraverseBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public BeanTraverseBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public BeanTraverseBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public BeanTraverseBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -439,20 +445,20 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public BeanTraverseBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public BeanTraverseBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public BeanTraverseBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -469,8 +475,14 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public BeanTraverseBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public BeanTraverseBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -505,14 +517,14 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder fluentSetters() {
- super.fluentSetters();
+ public BeanTraverseBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public BeanTraverseBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public BeanTraverseBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 1158898..83d5e03 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -74,7 +74,7 @@ public abstract class BeanTraverseContext extends BeanContext {
* <jc>// Create a serializer that automatically checks for recursions.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEANTRAVERSE_detectRecursions</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEANTRAVERSE_detectRecursions</jsf>)
* .build();
*
* <jc>// Create a POJO model with a recursive loop.</jc>
@@ -135,7 +135,7 @@ public abstract class BeanTraverseContext extends BeanContext {
* <jc>// Create a serializer ignores recursions.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEANTRAVERSE_ignoreRecursions</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEANTRAVERSE_ignoreRecursions</jsf>)
* .build();
*
* <jc>// Create a POJO model with a recursive loop.</jc>
@@ -193,7 +193,7 @@ public abstract class BeanTraverseContext extends BeanContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEANTRAVERSE_useWhitespace</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEANTRAVERSE_useWhitespace</jsf>)
* .set(<jsf>BEANTRAVERSE_initialDepth</jsf>, 2)
* .build();
*
@@ -273,7 +273,7 @@ public abstract class BeanTraverseContext extends BeanContext {
maxDepth = getIntegerProperty(BEANTRAVERSE_maxDepth, 100);
initialDepth = getIntegerProperty(BEANTRAVERSE_initialDepth, 0);
- ignoreRecursions = getBooleanProperty(BEANTRAVERSE_ignoreRecursions, false);
+ ignoreRecursions = getBooleanProperty(BEANTRAVERSE_ignoreRecursions);
detectRecursions = getBooleanProperty(BEANTRAVERSE_detectRecursions, ignoreRecursions);
}
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 7e27f26..ea10788 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
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.annotation.*;
@@ -102,7 +103,7 @@ public abstract class Context {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_debug</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_debug</jsf>)
* .build();
*
* <jc>// Create a POJO model with a recursive loop.</jc>
@@ -340,10 +341,10 @@ public abstract class Context {
public Context(PropertyStore ps, boolean allowReuse) {
this.propertyStore = ps == null ? PropertyStore.DEFAULT : ps;
this.identityCode = allowReuse ? new HashCode().add(getClass().getName()).add(ps).get() : System.identityHashCode(this);
- debug = getBooleanProperty(CONTEXT_debug, false);
+ debug = getBooleanProperty(CONTEXT_debug);
locale = getInstanceProperty(CONTEXT_locale, Locale.class, Locale.getDefault());
- timeZone = getInstanceProperty(CONTEXT_timeZone, TimeZone.class, null);
- mediaType = getInstanceProperty(CONTEXT_mediaType, MediaType.class, null);
+ timeZone = getInstanceProperty(CONTEXT_timeZone, TimeZone.class);
+ mediaType = getInstanceProperty(CONTEXT_mediaType, MediaType.class);
}
/**
@@ -380,6 +381,16 @@ public abstract class Context {
}
/**
+ * Shortcut for calling <code>getProperty(key, Boolean.<jk>class</jk>, <jk>false</jk>)</code>.
+ *
+ * @param key The property name.
+ * @return The property value, or <jk>false</jk> if it doesn't exist.
+ */
+ public final boolean getBooleanProperty(String key) {
+ return getBooleanProperty(key, false);
+ }
+
+ /**
* Shortcut for calling <code>getProperty(key, Integer.<jk>class</jk>, def)</code>.
*
* @param key The property name.
@@ -391,6 +402,16 @@ public abstract class Context {
}
/**
+ * Shortcut for calling <code>getProperty(key, Integer.<jk>class</jk>, -1)</code>.
+ *
+ * @param key The property name.
+ * @return The property value, or <c>-1</c> if it doesn't exist.
+ */
+ public final int getIntegerProperty(String key) {
+ return getIntegerProperty(key, -1);
+ }
+
+ /**
* Shortcut for calling <code>getProperty(key, Long.<jk>class</jk>, def)</code>.
*
* @param key The property name.
@@ -402,6 +423,16 @@ public abstract class Context {
}
/**
+ * Shortcut for calling <code>getProperty(key, Long.<jk>class</jk>, -1)</code>.
+ *
+ * @param key The property name.
+ * @return The property value, or <c>-1</c> if it doesn't exist.
+ */
+ public final long getLongProperty(String key) {
+ return getLongProperty(key, -1l);
+ }
+
+ /**
* Shortcut for calling <code>getProperty(key, String.<jk>class</jk>, def)</code>.
*
* @param key The property name.
@@ -413,6 +444,16 @@ public abstract class Context {
}
/**
+ * Shortcut for calling <code>getProperty(key, String.<jk>class</jk>, <jk>null</jk>)</code>.
+ *
+ * @param key The property name.
+ * @return The property value, or the <jk>null</jk> if it doesn't exist.
+ */
+ public final String getStringProperty(String key) {
+ return getStringProperty(key, null);
+ }
+
+ /**
* Returns a property as a parsed comma-delimited list of strings.
*
* @param key The property name.
@@ -448,11 +489,22 @@ public abstract class Context {
}
/**
+ * Returns the class property with the specified name.
+ *
+ * @param key The property name.
+ * @param type The class type of the property.
+ * @return The property value, or <jk>null</jk> if it doesn't exist.
+ */
+ public final <T> Class<? extends T> getClassProperty(String key, Class<T> type) {
+ return getClassProperty(key, type, null);
+ }
+
+ /**
* Returns the array property value with the specified name.
*
* @param key The property name.
* @param eType The class type of the elements in the property.
- * @return The property value, or the default value if it doesn't exist.
+ * @return The property value, or an empty array if it doesn't exist.
*/
public final <T> T[] getArrayProperty(String key, Class<T> eType) {
return propertyStore.getArrayProperty(key, eType);
@@ -643,6 +695,21 @@ public abstract class Context {
/**
* Returns an instance of the specified class, string, or object property.
*
+ * <p>
+ * If instantiating a class, assumes the class has a no-arg constructor.
+ * Otherwise, throws a runtime exception.
+ *
+ * @param key The property name.
+ * @param type The class type of the property.
+ * @return A new property instance or <jk>null</jk> if the property doesn't exist.
+ */
+ public <T> T getInstanceProperty(String key, Class<T> type) {
+ return getInstanceProperty(key, type, null);
+ }
+
+ /**
+ * Returns an instance of the specified class, string, or object property.
+ *
* @param key The property name.
* @param type The class type of the property.
* @param def
@@ -696,6 +763,18 @@ public abstract class Context {
*
* @param key The property name.
* @param type The class type of the property.
+ * @return A new property instance, or an empty array if it doesn't exist.
+ */
+ @SuppressWarnings("unchecked")
+ public <T> T[] getInstanceArrayProperty(String key, Class<T> type) {
+ return propertyStore.getInstanceArrayProperty(key, type, (T[])Array.newInstance(type, 0));
+ }
+
+ /**
+ * Returns the specified property as an array of instantiated objects.
+ *
+ * @param key The property name.
+ * @param type The class type of the property.
* @param def The default object to return if the property doesn't exist.
* @param resolver
* The resolver to use for instantiating objects.
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 c3bc7fb..bf2468a 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
@@ -18,6 +18,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.assertions.*;
import org.apache.juneau.csv.annotation.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.http.*;
@@ -108,8 +109,8 @@ public abstract class ContextBuilder {
* <jc>// Create a free-form set of properties.</jc>
* PropertyStore ps = PropertyStore
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_sortMaps</jsf>, <jk>true</jk>)
- * .set(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_sortMaps</jsf>)
+ * .set(<jsf>BEAN_sortProperties</jsf>)
* .build();
*
* <jc>// Create a serializer that uses those settings.</jc>
@@ -349,7 +350,7 @@ public abstract class ContextBuilder {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_debug</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_debug</jsf>)
* .build();
*
* <jc>// Create a POJO model with a recursive loop.</jc>
@@ -371,7 +372,7 @@ public abstract class ContextBuilder {
*/
@FluentSetter
public ContextBuilder debug() {
- return set(CONTEXT_debug, true);
+ return set(CONTEXT_debug);
}
/**
@@ -605,8 +606,8 @@ public abstract class ContextBuilder {
* <jc>// Same, but use generic set() method.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_sortMaps</jsf>, <jk>true</jk>)
- * .set(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_sortMaps</jsf>)
+ * .set(<jsf>BEAN_sortProperties</jsf>)
* .build();
* </p>
*
@@ -653,6 +654,31 @@ public abstract class ContextBuilder {
}
/**
+ * Convenience method for setting a boolean property to <jk>true</jk>.
+ *
+ * @param name The property name.
+ * @return This object (for method chaining).
+ */
+ @FluentSetter
+ public ContextBuilder set(String name) {
+ Assertions.assertString(name).msg("Property ''{0}'' is not boolean.", name).endsWith(".b");
+ psb.set(name);
+ return this;
+ }
+
+ /**
+ * Convenience method for setting a property to <jk>null</jk>.
+ *
+ * @param name The property name.
+ * @return This object (for method chaining).
+ */
+ @FluentSetter
+ public ContextBuilder unset(String name) {
+ psb.unset(name);
+ return this;
+ }
+
+ /**
* Peeks at a free-form configuration property on this object.
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
index 6b054c8..f9218d9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
@@ -63,7 +63,7 @@ import org.apache.juneau.reflect.*;
* PropertyStore ps = PropertyStore
* .<jsm>create</jsm>()
* .set(<js>"BeanContext.swaps.lc"</js>, MySwap.<jk>class</jk>)
- * .set(<js>"JsonSerializer.simpleMode.b"</js>, <jk>true</jk>)
+ * .set(<js>"JsonSerializer.simpleMode.b"</js>)
* .build();
* </p>
*
@@ -208,11 +208,10 @@ public final class PropertyStore {
this.hashCode = groups.hashCode();
}
-
/**
* Returns a subset of this property store consisting of just the specified group names.
- *
- * @param groups The group names to include.
+ *
+ * @param groups The group names to include.
* @return A new property store.
*/
public PropertyStore subset(String[] groups) {
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 7c12c78..13ed47a 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
@@ -21,6 +21,7 @@ import java.util.concurrent.*;
import java.util.regex.*;
import org.apache.juneau.PropertyStore.*;
+import org.apache.juneau.assertions.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
@@ -192,6 +193,33 @@ public class PropertyStoreBuilder {
}
/**
+ * Shortcut for calling <c>set(key,<jk>true</jk>)</c>.
+ *
+ * <p>
+ * Can only be called on boolean properties.
+ *
+ * @param key The configuration property key (e.g <js>"BeanContext.foo.b"</js>).
+ * @return This object (for method chaining).
+ */
+ public synchronized PropertyStoreBuilder set(String key) {
+ Assertions.assertString(key).msg("Property ''{0}'' is not a boolean.", key).endsWith(".b");
+ return set(key, true);
+ }
+
+ /**
+ * Shortcut for calling <c>set(key,<jk>null</jk>)</c>.
+ *
+ * <p>
+ * Setting the value to <jk>null</jk> has the identical behavior to removing it.
+ *
+ * @param key The configuration property key (e.g <js>"BeanContext.foo.b"</js>).
+ * @return This object (for method chaining).
+ */
+ public synchronized PropertyStoreBuilder unset(String key) {
+ return set(key, null);
+ }
+
+ /**
* Sets a configuration property value on this object but only if it's not already set.
*
* @param key The configuration property key (e.g <js>"BeanContext.foo.ss"</js>).
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index 6315698..14651d3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -126,12 +126,9 @@ public @interface Bean {
* <p>
* When <jk>true</jk>, fluent setters will be detected on beans.
*
- * <p>
- * Fluent setters
- *
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Bean</ja>(fluentSetters=<jk>true</jk>)
+ * <ja>@Bean</ja>(findFluentSetters=<jk>true</jk>)
* <jk>public class</jk> MyBean {
* <jk>public int</jk> getId() {...}
* <jk>public</jk> MyBean id(<jk>int</jk> id) {...}
@@ -148,10 +145,10 @@ public @interface Bean {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_fluentSetters}
+ * <li class='jf'>{@link BeanContext#BEAN_findFluentSetters}
* </ul>
*/
- boolean fluentSetters() default false;
+ boolean findFluentSetters() default false;
/**
* Implementation class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
index 3a39ed0..1c505ee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
@@ -74,7 +74,7 @@ public class BeanAnnotation {
.dictionary(a.dictionary())
.example(r.resolve(a.example()))
.excludeProperties(r.resolve(a.excludeProperties()))
- .fluentSetters(a.fluentSetters())
+ .findFluentSetters(a.findFluentSetters())
.implClass(a.implClass())
.interceptor(a.interceptor())
.interfaceClass(a.interfaceClass())
@@ -109,7 +109,7 @@ public class BeanAnnotation {
Class<? extends BeanInterceptor<?>> interceptor=BeanInterceptor.Default.class;
Class<? extends PropertyNamer> propertyNamer=BasicPropertyNamer.class;
String example="", excludeProperties="", p="", properties="", readOnlyProperties="", ro="", typeName="", typePropertyName="", wo="", writeOnlyProperties="", xp="";
- boolean fluentSetters, sort;
+ boolean findFluentSetters, sort;
/**
* Constructor.
@@ -161,13 +161,13 @@ public class BeanAnnotation {
}
/**
- * Sets the {@link Bean#fluentSetters()} property on this annotation.
+ * Sets the {@link Bean#findFluentSetters()} property on this annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder fluentSetters(boolean value) {
- this.fluentSetters = value;
+ public Builder findFluentSetters(boolean value) {
+ this.findFluentSetters = value;
return this;
}
@@ -361,7 +361,7 @@ public class BeanAnnotation {
private static class Impl extends TargetedAnnotationTImpl implements Bean {
- private final boolean fluentSetters, sort;
+ private final boolean findFluentSetters, sort;
private final Class<? extends BeanInterceptor<?>> interceptor;
private final Class<? extends PropertyNamer> propertyNamer;
private final Class<?> implClass, interfaceClass, stopClass;
@@ -373,7 +373,7 @@ public class BeanAnnotation {
this.dictionary = copyOf(b.dictionary);
this.example = b.example;
this.excludeProperties = b.excludeProperties;
- this.fluentSetters = b.fluentSetters;
+ this.findFluentSetters = b.findFluentSetters;
this.implClass = b.implClass;
this.interceptor = b.interceptor;
this.interfaceClass = b.interfaceClass;
@@ -408,8 +408,8 @@ public class BeanAnnotation {
}
@Override /* Bean */
- public boolean fluentSetters() {
- return fluentSetters;
+ public boolean findFluentSetters() {
+ return findFluentSetters;
}
@Override /* Bean */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 8ea69d2..f91bc5c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -414,10 +414,10 @@ public @interface BeanConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_fluentSetters}
+ * <li class='jf'>{@link BeanContext#BEAN_findFluentSetters}
* </ul>
*/
- String fluentSetters() default "";
+ String findFluentSetters() default "";
/**
* Configuration property: Ignore invocation errors on getters.
@@ -486,10 +486,10 @@ public @interface BeanConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_disableSilentlyIgnoreMissingSetters}
+ * <li class='jf'>{@link BeanContext#BEAN_disableIgnoreMissingSetters}
* </ul>
*/
- String disableSilentlyIgnoreMissingSetters() default "";
+ String disableIgnoreMissingSetters() default "";
/**
* Configuration property: Don't ignore transient fields.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
index f1d44ac..af76d44 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
@@ -72,14 +72,14 @@ public class BeanConfigAnnotation {
psb.set(BEAN_typePropertyName, string(a.typePropertyName()));
if (! a.debug().isEmpty())
psb.set(CONTEXT_debug, bool(a.debug()));
- if (! a.fluentSetters().isEmpty())
- psb.set(BEAN_fluentSetters, bool(a.fluentSetters()));
+ if (! a.findFluentSetters().isEmpty())
+ psb.set(BEAN_findFluentSetters, bool(a.findFluentSetters()));
if (! a.ignoreInvocationExceptionsOnGetters().isEmpty())
psb.set(BEAN_ignoreInvocationExceptionsOnGetters, bool(a.ignoreInvocationExceptionsOnGetters()));
if (! a.ignoreInvocationExceptionsOnSetters().isEmpty())
psb.set(BEAN_ignoreInvocationExceptionsOnSetters, bool(a.ignoreInvocationExceptionsOnSetters()));
- if (! a.disableSilentlyIgnoreMissingSetters().isEmpty())
- psb.set(BEAN_disableSilentlyIgnoreMissingSetters, bool(a.disableSilentlyIgnoreMissingSetters()));
+ if (! a.disableIgnoreMissingSetters().isEmpty())
+ psb.set(BEAN_disableIgnoreMissingSetters, bool(a.disableIgnoreMissingSetters()));
if (! a.disableIgnoreTransientFields().isEmpty())
psb.set(BEAN_disableIgnoreTransientFields, bool(a.disableIgnoreTransientFields()));
if (! a.ignoreUnknownBeanProperties().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 70b873a..242ff79 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
@@ -140,6 +140,12 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public CsvParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public CsvParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -157,6 +163,12 @@ public class CsvParserBuilder extends ReaderParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public CsvParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public CsvParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -200,44 +212,38 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public CsvParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public CsvParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public CsvParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public CsvParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public CsvParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public CsvParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -278,20 +284,20 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public CsvParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public CsvParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public CsvParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -308,8 +314,14 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public CsvParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public CsvParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -344,14 +356,14 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder fluentSetters() {
- super.fluentSetters();
+ public CsvParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public CsvParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 7f476d0..53d3339 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
@@ -140,6 +140,12 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public CsvSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public CsvSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -157,6 +163,12 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public CsvSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public CsvSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -200,44 +212,38 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public CsvSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public CsvSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public CsvSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public CsvSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public CsvSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public CsvSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -278,20 +284,20 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public CsvSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public CsvSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public CsvSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -308,8 +314,14 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public CsvSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public CsvSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -344,14 +356,14 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public CsvSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public CsvSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public CsvSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 2904f86..594854a 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
@@ -802,13 +802,13 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
aside = getArrayProperty(HTMLDOC_aside, String.class);
asideFloat = getProperty(HTMLDOC_asideFloat, AsideFloat.class, AsideFloat.RIGHT);
footer = getArrayProperty(HTMLDOC_footer, String.class);
- nowrap = getBooleanProperty(HTMLDOC_nowrap, false);
+ nowrap = getBooleanProperty(HTMLDOC_nowrap);
navlinks = getArrayProperty(HTMLDOC_navlinks, String.class);
noResultsMessage = getStringProperty(HTMLDOC_noResultsMessage, "<p>no results</p>");
template = getInstanceProperty(HTMLDOC_template, HtmlDocTemplate.class, BasicHtmlDocTemplate.class);
Map<String,HtmlWidget> widgets = new HashMap<>();
- for (HtmlWidget w : getInstanceArrayProperty(HTMLDOC_widgets, HtmlWidget.class, new HtmlWidget[0]))
+ for (HtmlWidget w : getInstanceArrayProperty(HTMLDOC_widgets, HtmlWidget.class))
widgets.put(w.getName(), w);
this.widgets = Collections.unmodifiableMap(widgets);
}
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 e31085f..302f113 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
@@ -364,7 +364,7 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
*/
@FluentSetter
public HtmlDocSerializerBuilder nowrap() {
- set(HTMLDOC_nowrap, true);
+ set(HTMLDOC_nowrap);
return this;
}
@@ -666,6 +666,12 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlDocSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlDocSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -683,6 +689,12 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlDocSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public HtmlDocSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -726,44 +738,38 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public HtmlDocSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public HtmlDocSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public HtmlDocSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public HtmlDocSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public HtmlDocSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public HtmlDocSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -804,20 +810,20 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public HtmlDocSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public HtmlDocSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public HtmlDocSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -834,8 +840,14 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public HtmlDocSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public HtmlDocSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -870,14 +882,14 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public HtmlDocSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlDocSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public HtmlDocSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 f834f1d..31aa15b 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
@@ -143,6 +143,12 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -160,6 +166,12 @@ public class HtmlParserBuilder extends XmlParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public HtmlParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -203,44 +215,38 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public HtmlParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public HtmlParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public HtmlParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public HtmlParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public HtmlParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public HtmlParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -281,20 +287,20 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public HtmlParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public HtmlParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public HtmlParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -311,8 +317,14 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public HtmlParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public HtmlParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -347,14 +359,14 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder fluentSetters() {
- super.fluentSetters();
+ public HtmlParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public HtmlParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 fd7f309..344857e 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
@@ -123,7 +123,7 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
*/
@FluentSetter
public HtmlSchemaSerializerBuilder allowNestedDescriptions() {
- return set(JSONSCHEMA_allowNestedDescriptions, true);
+ return set(JSONSCHEMA_allowNestedDescriptions);
}
/**
@@ -140,7 +140,7 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
*/
@FluentSetter
public HtmlSchemaSerializerBuilder allowNestedExamples() {
- return set(JSONSCHEMA_allowNestedExamples, true);
+ return set(JSONSCHEMA_allowNestedExamples);
}
/**
@@ -230,7 +230,7 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
*/
@FluentSetter
public HtmlSchemaSerializerBuilder useBeanDefs() {
- return set(JSONSCHEMA_useBeanDefs, true);
+ return set(JSONSCHEMA_useBeanDefs);
}
// <FluentSetters>
@@ -320,6 +320,12 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlSchemaSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlSchemaSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -337,6 +343,12 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlSchemaSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public HtmlSchemaSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -380,44 +392,38 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public HtmlSchemaSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public HtmlSchemaSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public HtmlSchemaSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public HtmlSchemaSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public HtmlSchemaSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public HtmlSchemaSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -458,20 +464,20 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public HtmlSchemaSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public HtmlSchemaSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public HtmlSchemaSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -488,8 +494,14 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public HtmlSchemaSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -524,14 +536,14 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public HtmlSchemaSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSchemaSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public HtmlSchemaSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 091ba82..1b82a57 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -716,11 +716,11 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider, H
public HtmlSerializer(PropertyStore ps, String produces, String accept) {
super(ps, produces, accept);
uriAnchorText = getProperty(HTML_uriAnchorText, AnchorText.class, AnchorText.TO_STRING);
- detectLabelParameters = ! getBooleanProperty(HTML_disableDetectLabelParameters, false);
- detectLinksInStrings = ! getBooleanProperty(HTML_disableDetectLinksInStrings, false);
+ detectLabelParameters = ! getBooleanProperty(HTML_disableDetectLabelParameters);
+ detectLinksInStrings = ! getBooleanProperty(HTML_disableDetectLinksInStrings);
labelParameter = getStringProperty(HTML_labelParameter, "label");
- addKeyValueTableHeaders = getBooleanProperty(HTML_addKeyValueTableHeaders, false);
- addBeanTypes = getBooleanProperty(HTML_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes, false));
+ addKeyValueTableHeaders = getBooleanProperty(HTML_addKeyValueTableHeaders);
+ addBeanTypes = getBooleanProperty(HTML_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes));
}
@Override /* Context */
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 de158a5..2650e0e 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
@@ -70,7 +70,7 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
*/
@FluentSetter
public HtmlSerializerBuilder addKeyValueTableHeaders() {
- return set(HTML_addKeyValueTableHeaders, true);
+ return set(HTML_addKeyValueTableHeaders);
}
/**
@@ -88,7 +88,7 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
*/
@FluentSetter
public HtmlSerializerBuilder disableDetectLinksInStrings() {
- return set(HTML_disableDetectLinksInStrings, true);
+ return set(HTML_disableDetectLinksInStrings);
}
/**
@@ -125,7 +125,7 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
*/
@FluentSetter
public HtmlSerializerBuilder disableDetectLabelParameters() {
- return set(HTML_disableDetectLabelParameters, true);
+ return set(HTML_disableDetectLabelParameters);
}
/**
@@ -236,6 +236,12 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -253,6 +259,12 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public HtmlSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -296,44 +308,38 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public HtmlSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public HtmlSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public HtmlSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public HtmlSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public HtmlSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public HtmlSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -374,20 +380,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public HtmlSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public HtmlSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public HtmlSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -404,8 +410,14 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public HtmlSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public HtmlSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -440,14 +452,14 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public HtmlSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public HtmlSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 21f0fa0..6aa3f89 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
@@ -140,6 +140,12 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public HtmlStrippedDocSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public HtmlStrippedDocSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -157,6 +163,12 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public HtmlStrippedDocSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public HtmlStrippedDocSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -200,44 +212,38 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public HtmlStrippedDocSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public HtmlStrippedDocSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public HtmlStrippedDocSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public HtmlStrippedDocSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public HtmlStrippedDocSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public HtmlStrippedDocSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -278,20 +284,20 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public HtmlStrippedDocSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public HtmlStrippedDocSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public HtmlStrippedDocSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -308,8 +314,14 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public HtmlStrippedDocSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -344,14 +356,14 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public HtmlStrippedDocSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public HtmlStrippedDocSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public HtmlStrippedDocSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 05210ea..1203f6f 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
@@ -139,6 +139,12 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsoParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsoParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -156,6 +162,12 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public JsoParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public JsoParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -199,44 +211,38 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public JsoParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public JsoParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public JsoParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public JsoParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public JsoParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public JsoParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -277,20 +283,20 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public JsoParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public JsoParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public JsoParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -307,8 +313,14 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public JsoParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public JsoParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -343,14 +355,14 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder fluentSetters() {
- super.fluentSetters();
+ public JsoParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public JsoParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 11d442d..a656646 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
@@ -139,6 +139,12 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsoSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsoSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -156,6 +162,12 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public JsoSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public JsoSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -199,44 +211,38 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public JsoSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public JsoSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public JsoSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public JsoSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public JsoSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public JsoSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -277,20 +283,20 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public JsoSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public JsoSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public JsoSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -307,8 +313,14 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public JsoSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public JsoSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -343,14 +355,14 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public JsoSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsoSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public JsoSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index e7eebca..53b8afb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -150,7 +150,7 @@ public class JsonParser extends ReaderParser implements JsonMetaProvider, JsonCo
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser.
* .<jsm>create</jsm>()
- * .set(<jsf>JSON_validateEnd</jsf>, <jk>true</jk>)
+ * .set(<jsf>JSON_validateEnd</jsf>)
* .build();
*
* <jc>// Should fail because input has multiple POJOs.</jc>
@@ -215,7 +215,7 @@ public class JsonParser extends ReaderParser implements JsonMetaProvider, JsonCo
*/
public JsonParser(PropertyStore ps, String...consumes) {
super(ps, consumes);
- validateEnd = getBooleanProperty(JSON_validateEnd, false);
+ validateEnd = getBooleanProperty(JSON_validateEnd);
}
@Override /* Context */
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 6be85835..4ec485e 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
@@ -70,7 +70,7 @@ public class JsonParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public JsonParserBuilder validateEnd() {
- return set(JSON_validateEnd, true);
+ return set(JSON_validateEnd);
}
// <FluentSetters>
@@ -160,6 +160,12 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsonParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -177,6 +183,12 @@ public class JsonParserBuilder extends ReaderParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public JsonParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public JsonParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -220,44 +232,38 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public JsonParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public JsonParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public JsonParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public JsonParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public JsonParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public JsonParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -298,20 +304,20 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public JsonParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public JsonParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public JsonParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -328,8 +334,14 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public JsonParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public JsonParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -364,14 +376,14 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder fluentSetters() {
- super.fluentSetters();
+ public JsonParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public JsonParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
index b553007..a9cb186 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
@@ -122,7 +122,7 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
*/
@FluentSetter
public JsonSchemaSerializerBuilder allowNestedDescriptions() {
- return set(JSONSCHEMA_allowNestedDescriptions, true);
+ return set(JSONSCHEMA_allowNestedDescriptions);
}
/**
@@ -139,7 +139,7 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
*/
@FluentSetter
public JsonSchemaSerializerBuilder allowNestedExamples() {
- return set(JSONSCHEMA_allowNestedExamples, true);
+ return set(JSONSCHEMA_allowNestedExamples);
}
/**
@@ -229,7 +229,7 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
*/
@FluentSetter
public JsonSchemaSerializerBuilder useBeanDefs() {
- return set(JSONSCHEMA_useBeanDefs, true);
+ return set(JSONSCHEMA_useBeanDefs);
}
// <FluentSetters>
@@ -319,6 +319,12 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsonSchemaSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonSchemaSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -336,6 +342,12 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public JsonSchemaSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public JsonSchemaSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -379,44 +391,38 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public JsonSchemaSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public JsonSchemaSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public JsonSchemaSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public JsonSchemaSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public JsonSchemaSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public JsonSchemaSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -457,20 +463,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public JsonSchemaSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public JsonSchemaSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public JsonSchemaSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -487,8 +493,14 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public JsonSchemaSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public JsonSchemaSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -523,14 +535,14 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public JsonSchemaSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public JsonSchemaSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
@@ -799,8 +811,8 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - JsonSerializerBuilder */
- public JsonSchemaSerializerBuilder simple() {
- super.simple();
+ public JsonSchemaSerializerBuilder simpleMode() {
+ super.simpleMode();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 9b4ee63..5621818 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -173,7 +173,7 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
* .simple()
- * .set(<jsf>JSON_escapeSolidus</jsf>, <jk>true</jk>)
+ * .set(<jsf>JSON_escapeSolidus</jsf>)
* .build();
*
* <jc>// Produces: "{foo:'<\/bar>'"</jc>
@@ -200,7 +200,7 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link org.apache.juneau.json.JsonSerializerBuilder#simple()}
+ * <li class='jm'>{@link org.apache.juneau.json.JsonSerializerBuilder#simpleMode()}
* <li class='jm'>{@link org.apache.juneau.json.JsonSerializerBuilder#ssq()}
* </ul>
* </ul>
@@ -378,9 +378,9 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
public JsonSerializer(PropertyStore ps, String produces, String accept) {
super(ps, produces, accept);
- simpleMode = getBooleanProperty(JSON_simpleMode, false);
- escapeSolidus = getBooleanProperty(JSON_escapeSolidus, false);
- addBeanTypes = getBooleanProperty(JSON_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes, false));
+ simpleMode = getBooleanProperty(JSON_simpleMode);
+ escapeSolidus = getBooleanProperty(JSON_escapeSolidus);
+ addBeanTypes = getBooleanProperty(JSON_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes));
}
@Override /* Context */
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 330f058..5e19342 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
@@ -71,7 +71,7 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
*/
@FluentSetter
public JsonSerializerBuilder escapeSolidus() {
- return set(JSON_escapeSolidus, true);
+ return set(JSON_escapeSolidus);
}
/**
@@ -87,8 +87,8 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public JsonSerializerBuilder simple() {
- return set(JSON_simpleMode, true);
+ public JsonSerializerBuilder simpleMode() {
+ return set(JSON_simpleMode);
}
/**
@@ -106,7 +106,7 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
*/
@FluentSetter
public JsonSerializerBuilder ssq() {
- return simple().sq();
+ return simpleMode().sq();
}
// <FluentSetters>
@@ -196,6 +196,12 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsonSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -213,6 +219,12 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public JsonSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public JsonSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -256,44 +268,38 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public JsonSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public JsonSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public JsonSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public JsonSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public JsonSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public JsonSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -334,20 +340,20 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public JsonSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public JsonSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public JsonSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -364,8 +370,14 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public JsonSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public JsonSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -400,14 +412,14 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public JsonSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public JsonSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 a2bd9ad..e7cd24b 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
@@ -139,6 +139,12 @@ public class SimpleJsonParserBuilder extends JsonParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SimpleJsonParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SimpleJsonParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -156,6 +162,12 @@ public class SimpleJsonParserBuilder extends JsonParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public SimpleJsonParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public SimpleJsonParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -199,44 +211,38 @@ public class SimpleJsonParserBuilder extends JsonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public SimpleJsonParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public SimpleJsonParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public SimpleJsonParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public SimpleJsonParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public SimpleJsonParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public SimpleJsonParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -277,20 +283,20 @@ public class SimpleJsonParserBuilder extends JsonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public SimpleJsonParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public SimpleJsonParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public SimpleJsonParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -307,8 +313,14 @@ public class SimpleJsonParserBuilder extends JsonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public SimpleJsonParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public SimpleJsonParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -343,14 +355,14 @@ public class SimpleJsonParserBuilder extends JsonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder fluentSetters() {
- super.fluentSetters();
+ public SimpleJsonParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public SimpleJsonParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 139a318..b3e5096 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
@@ -139,6 +139,12 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SimpleJsonSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SimpleJsonSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -156,6 +162,12 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public SimpleJsonSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public SimpleJsonSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -199,44 +211,38 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public SimpleJsonSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public SimpleJsonSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public SimpleJsonSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public SimpleJsonSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public SimpleJsonSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public SimpleJsonSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -277,20 +283,20 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public SimpleJsonSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public SimpleJsonSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public SimpleJsonSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -307,8 +313,14 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public SimpleJsonSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public SimpleJsonSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -343,14 +355,14 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public SimpleJsonSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SimpleJsonSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public SimpleJsonSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
@@ -619,8 +631,8 @@ public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* GENERATED - JsonSerializerBuilder */
- public SimpleJsonSerializerBuilder simple() {
- super.simple();
+ public SimpleJsonSerializerBuilder simpleMode() {
+ super.simpleMode();
return this;
}
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 22916e0..815a7f8 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
@@ -318,12 +318,12 @@ public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSche
public JsonSchemaGenerator(PropertyStore ps) {
super(ps.builder().setDefault(BEANTRAVERSE_detectRecursions, true).setDefault(BEANTRAVERSE_ignoreRecursions, true).build());
- useBeanDefs = getBooleanProperty(JSONSCHEMA_useBeanDefs, false);
- allowNestedExamples = getBooleanProperty(JSONSCHEMA_allowNestedExamples, false);
- allowNestedDescriptions = getBooleanProperty(JSONSCHEMA_allowNestedDescriptions, false);
+ useBeanDefs = getBooleanProperty(JSONSCHEMA_useBeanDefs);
+ allowNestedExamples = getBooleanProperty(JSONSCHEMA_allowNestedExamples);
+ allowNestedDescriptions = getBooleanProperty(JSONSCHEMA_allowNestedDescriptions);
beanDefMapper = getInstanceProperty(JSONSCHEMA_beanDefMapper, BeanDefMapper.class, BasicBeanDefMapper.class);
- addExamplesTo = TypeCategory.parse(getStringProperty(JSONSCHEMA_addExamplesTo, null));
- addDescriptionsTo = TypeCategory.parse(getStringProperty(JSONSCHEMA_addDescriptionsTo, null));
+ addExamplesTo = TypeCategory.parse(getStringProperty(JSONSCHEMA_addExamplesTo));
+ addDescriptionsTo = TypeCategory.parse(getStringProperty(JSONSCHEMA_addDescriptionsTo));
Set<Pattern> ignoreTypes = new LinkedHashSet<>();
for (String s : split(ps.getProperty(JSONSCHEMA_ignoreTypes, String.class, "")))
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 fdb2615..9ac5331 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
@@ -120,7 +120,7 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public JsonSchemaGeneratorBuilder allowNestedDescriptions() {
- return set(JSONSCHEMA_allowNestedDescriptions, true);
+ return set(JSONSCHEMA_allowNestedDescriptions);
}
/**
@@ -137,7 +137,7 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public JsonSchemaGeneratorBuilder allowNestedExamples() {
- return set(JSONSCHEMA_allowNestedExamples, true);
+ return set(JSONSCHEMA_allowNestedExamples);
}
/**
@@ -259,7 +259,7 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public JsonSchemaGeneratorBuilder useBeanDefs() {
- return set(JSONSCHEMA_useBeanDefs, true);
+ return set(JSONSCHEMA_useBeanDefs);
}
// <FluentSetters>
@@ -349,6 +349,12 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public JsonSchemaGeneratorBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public JsonSchemaGeneratorBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -366,6 +372,12 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public JsonSchemaGeneratorBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public JsonSchemaGeneratorBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -409,44 +421,38 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public JsonSchemaGeneratorBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public JsonSchemaGeneratorBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public JsonSchemaGeneratorBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public JsonSchemaGeneratorBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public JsonSchemaGeneratorBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public JsonSchemaGeneratorBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -487,20 +493,20 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public JsonSchemaGeneratorBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public JsonSchemaGeneratorBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public JsonSchemaGeneratorBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -517,8 +523,14 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public JsonSchemaGeneratorBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -553,14 +565,14 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder fluentSetters() {
- super.fluentSetters();
+ public JsonSchemaGeneratorBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public JsonSchemaGeneratorBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public JsonSchemaGeneratorBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 38893fb..85d64c4 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
@@ -139,6 +139,12 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public MsgPackParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public MsgPackParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -156,6 +162,12 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public MsgPackParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public MsgPackParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -199,44 +211,38 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public MsgPackParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public MsgPackParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public MsgPackParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public MsgPackParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public MsgPackParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public MsgPackParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -277,20 +283,20 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public MsgPackParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public MsgPackParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public MsgPackParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -307,8 +313,14 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public MsgPackParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public MsgPackParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -343,14 +355,14 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder fluentSetters() {
- super.fluentSetters();
+ public MsgPackParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public MsgPackParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index e59caac..5f8d6a4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -135,7 +135,7 @@ public class MsgPackSerializer extends OutputStreamSerializer implements MsgPack
*/
public MsgPackSerializer(PropertyStore ps) {
super(ps, "octal/msgpack", null);
- this.addBeanTypes = getBooleanProperty(MSGPACK_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes, false));
+ this.addBeanTypes = getBooleanProperty(MSGPACK_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes));
}
@Override /* Context */
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 412110d..c8110f3 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
@@ -139,6 +139,12 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public MsgPackSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public MsgPackSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -156,6 +162,12 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public MsgPackSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public MsgPackSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -199,44 +211,38 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public MsgPackSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public MsgPackSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public MsgPackSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public MsgPackSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public MsgPackSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public MsgPackSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -277,20 +283,20 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public MsgPackSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public MsgPackSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public MsgPackSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -307,8 +313,14 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public MsgPackSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public MsgPackSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -343,14 +355,14 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public MsgPackSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public MsgPackSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public MsgPackSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionInfo.java
index 3a08b30..0c877da 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionInfo.java
@@ -19,7 +19,7 @@ import org.apache.juneau.annotation.*;
/**
* Stores information about an exception.
*/
-@Bean(properties="hash,exceptionClass,message,stackTrace,causedBy", fluentSetters=true)
+@Bean(properties="hash,exceptionClass,message,stackTrace,causedBy", findFluentSetters=true)
public class ExceptionInfo implements Cloneable {
private String hash;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionStats.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionStats.java
index 1cbed8a..eff7ea7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionStats.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ExceptionStats.java
@@ -20,7 +20,7 @@ import org.apache.juneau.annotation.*;
/**
* Represents an entry in {@link ExceptionStore}.
*/
-@Bean(properties="hash,count,exceptionClass,message,stackTrace,causedBy", fluentSetters=true)
+@Bean(properties="hash,count,exceptionClass,message,stackTrace,causedBy", findFluentSetters=true)
public class ExceptionStats extends ExceptionInfo implements Comparable<ExceptionStats> {
private final AtomicInteger count = new AtomicInteger(0);
private transient long timeout = -1;
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 6dc25de..cf9c111 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
@@ -255,6 +255,12 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public OpenApiParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public OpenApiParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -272,6 +278,12 @@ public class OpenApiParserBuilder extends UonParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public OpenApiParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public OpenApiParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -315,44 +327,38 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public OpenApiParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public OpenApiParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public OpenApiParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public OpenApiParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public OpenApiParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public OpenApiParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -393,20 +399,20 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public OpenApiParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public OpenApiParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public OpenApiParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -423,8 +429,14 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public OpenApiParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public OpenApiParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -459,14 +471,14 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder fluentSetters() {
- super.fluentSetters();
+ public OpenApiParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public OpenApiParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 f33d346..d92abb0 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
@@ -266,6 +266,12 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public OpenApiSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public OpenApiSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -283,6 +289,12 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public OpenApiSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public OpenApiSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -326,44 +338,38 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public OpenApiSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public OpenApiSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public OpenApiSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public OpenApiSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public OpenApiSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public OpenApiSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -404,20 +410,20 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public OpenApiSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public OpenApiSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public OpenApiSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -434,8 +440,14 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public OpenApiSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public OpenApiSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -470,14 +482,14 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public OpenApiSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OpenApiSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public OpenApiSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 2a3b018..b8859ba 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
@@ -170,6 +170,12 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public InputStreamParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public InputStreamParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -187,6 +193,12 @@ public class InputStreamParserBuilder extends ParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public InputStreamParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public InputStreamParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -230,44 +242,38 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public InputStreamParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public InputStreamParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public InputStreamParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public InputStreamParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public InputStreamParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public InputStreamParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -308,20 +314,20 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public InputStreamParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public InputStreamParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public InputStreamParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -338,8 +344,14 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public InputStreamParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public InputStreamParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -374,14 +386,14 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder fluentSetters() {
- super.fluentSetters();
+ public InputStreamParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public InputStreamParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public InputStreamParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 1e91304..4959424 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -174,7 +174,7 @@ public abstract class Parser extends BeanContext {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>PARSER_autoCloseStreams</jsf>, <jk>true</jk>)
+ * .set(<jsf>PARSER_autoCloseStreams</jsf>)
* .build();
*
* Reader r = <jk>new</jk> FileReader(<js>"/tmp/myfile.json"</js>);
@@ -225,7 +225,7 @@ public abstract class Parser extends BeanContext {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>BEAN_debug</jsf>, <jk>true</jk>)
+ * .set(<jsf>BEAN_debug</jsf>)
* .set(<jsf>PARSER_debugOutputLines</jsf>, 100)
* .build();
*
@@ -374,7 +374,7 @@ public abstract class Parser extends BeanContext {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>PARSER_strict</jsf>, <jk>true</jk>)
+ * .set(<jsf>PARSER_strict</jsf>)
* .build();
*
* <jc>// Use it.</jc>
@@ -426,7 +426,7 @@ public abstract class Parser extends BeanContext {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>PARSER_trimStrings</jsf>, <jk>true</jk>)
+ * .set(<jsf>PARSER_trimStrings</jsf>)
* .build();
*
* <jc>// Use it.</jc>
@@ -482,7 +482,7 @@ public abstract class Parser extends BeanContext {
* <jc>// Same, but use property.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .set(<jsf>PARSER_unbuffered</jsf>, <jk>true</jk>)
+ * .set(<jsf>PARSER_unbuffered</jsf>)
* .build();
*
* <jc>// If you're calling parse on the same input multiple times, use a session instead of the parser directly.</jc>
@@ -539,12 +539,12 @@ public abstract class Parser extends BeanContext {
protected Parser(PropertyStore ps, String...consumes) {
super(ps);
- trimStrings = getBooleanProperty(PARSER_trimStrings, false);
- strict = getBooleanProperty(PARSER_strict, false);
- autoCloseStreams = getBooleanProperty(PARSER_autoCloseStreams, false);
+ trimStrings = getBooleanProperty(PARSER_trimStrings);
+ strict = getBooleanProperty(PARSER_strict);
+ autoCloseStreams = getBooleanProperty(PARSER_autoCloseStreams);
debugOutputLines = getIntegerProperty(PARSER_debugOutputLines, 5);
- unbuffered = getBooleanProperty(PARSER_unbuffered, false);
- listener = getClassProperty(PARSER_listener, ParserListener.class, null);
+ unbuffered = getBooleanProperty(PARSER_unbuffered);
+ listener = getClassProperty(PARSER_listener, ParserListener.class);
this.consumes = new MediaType[consumes.length];
for (int i = 0; i < consumes.length; i++) {
this.consumes[i] = MediaType.of(consumes[i]);
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 61ad35d..a6c7b5d 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
@@ -84,7 +84,7 @@ public class ParserBuilder extends BeanContextBuilder {
*/
@FluentSetter
public ParserBuilder autoCloseStreams() {
- return set(PARSER_autoCloseStreams, true);
+ return set(PARSER_autoCloseStreams);
}
/**
@@ -239,7 +239,7 @@ public class ParserBuilder extends BeanContextBuilder {
*/
@FluentSetter
public ParserBuilder strict() {
- return set(PARSER_strict, true);
+ return set(PARSER_strict);
}
/**
@@ -273,7 +273,7 @@ public class ParserBuilder extends BeanContextBuilder {
*/
@FluentSetter
public ParserBuilder trimStrings() {
- return set(PARSER_trimStrings, true);
+ return set(PARSER_trimStrings);
}
/**
@@ -328,7 +328,7 @@ public class ParserBuilder extends BeanContextBuilder {
*/
@FluentSetter
public ParserBuilder unbuffered() {
- return set(PARSER_unbuffered, true);
+ return set(PARSER_unbuffered);
}
// <FluentSetters>
@@ -418,6 +418,12 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -435,6 +441,12 @@ public class ParserBuilder extends BeanContextBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public ParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -478,44 +490,38 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public ParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public ParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public ParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public ParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public ParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public ParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -556,20 +562,20 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public ParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public ParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public ParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -586,8 +592,14 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public ParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public ParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -622,14 +634,14 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder fluentSetters() {
- super.fluentSetters();
+ public ParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public ParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
index 3e27d2f..970297c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -59,7 +59,7 @@ import org.apache.juneau.http.header.*;
* b.append(JsonParser.<jk>class</jk>, XmlParser.<jk>class</jk>);
*
* <jc>// Change settings on parsers simultaneously</jc>
- * b.set(BeanContext.<jsf>BEAN_beansRequireSerializable</jsf>, <jk>true</jk>)
+ * b.set(BeanContext.<jsf>BEAN_beansRequireSerializable</jsf>)
* .swaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>);
*
* ParserGroup g = b.build();
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 abc4f5e..6f53c94 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
@@ -166,7 +166,7 @@ public class ParserGroupBuilder extends BeanContextBuilder {
* @return This object (for method chaining).
*/
public ParserGroupBuilder autoCloseStreams() {
- return set(PARSER_autoCloseStreams, true);
+ return set(PARSER_autoCloseStreams);
}
/**
@@ -238,7 +238,7 @@ public class ParserGroupBuilder extends BeanContextBuilder {
* @return This object (for method chaining).
*/
public ParserGroupBuilder strict() {
- return set(PARSER_strict, true);
+ return set(PARSER_strict);
}
/**
@@ -274,7 +274,7 @@ public class ParserGroupBuilder extends BeanContextBuilder {
* @return This object (for method chaining).
*/
public ParserGroupBuilder trimStrings() {
- return set(PARSER_trimStrings, true);
+ return set(PARSER_trimStrings);
}
/**
@@ -309,7 +309,7 @@ public class ParserGroupBuilder extends BeanContextBuilder {
* @return This object (for method chaining).
*/
public ParserGroupBuilder unbuffered() {
- return set(PARSER_unbuffered, true);
+ return set(PARSER_unbuffered);
}
/**
@@ -457,6 +457,12 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ParserGroupBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ParserGroupBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -474,6 +480,12 @@ public class ParserGroupBuilder extends BeanContextBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ParserGroupBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public ParserGroupBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -517,44 +529,38 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public ParserGroupBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public ParserGroupBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public ParserGroupBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public ParserGroupBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public ParserGroupBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public ParserGroupBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -595,20 +601,20 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public ParserGroupBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public ParserGroupBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public ParserGroupBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -625,8 +631,14 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public ParserGroupBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public ParserGroupBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -661,14 +673,14 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder fluentSetters() {
- super.fluentSetters();
+ public ParserGroupBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ParserGroupBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public ParserGroupBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 2148c69..07253aa 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
@@ -207,6 +207,12 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public ReaderParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public ReaderParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -224,6 +230,12 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public ReaderParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public ReaderParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -267,44 +279,38 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public ReaderParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public ReaderParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public ReaderParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public ReaderParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public ReaderParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public ReaderParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -345,20 +351,20 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public ReaderParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public ReaderParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public ReaderParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -375,8 +381,14 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public ReaderParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public ReaderParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -411,14 +423,14 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder fluentSetters() {
- super.fluentSetters();
+ public ReaderParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public ReaderParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public ReaderParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 3ee2ec4..5d069ae 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
@@ -140,6 +140,12 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public PlainTextParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public PlainTextParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -157,6 +163,12 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public PlainTextParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public PlainTextParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -200,44 +212,38 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public PlainTextParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public PlainTextParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public PlainTextParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public PlainTextParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public PlainTextParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public PlainTextParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -278,20 +284,20 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public PlainTextParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public PlainTextParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public PlainTextParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -308,8 +314,14 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public PlainTextParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public PlainTextParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -344,14 +356,14 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder fluentSetters() {
- super.fluentSetters();
+ public PlainTextParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public PlainTextParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 fee694a..9e74506 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
@@ -140,6 +140,12 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public PlainTextSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public PlainTextSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -157,6 +163,12 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public PlainTextSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public PlainTextSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -200,44 +212,38 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public PlainTextSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public PlainTextSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public PlainTextSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public PlainTextSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public PlainTextSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public PlainTextSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -278,20 +284,20 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public PlainTextSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public PlainTextSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public PlainTextSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -308,8 +314,14 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public PlainTextSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public PlainTextSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -344,14 +356,14 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public PlainTextSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public PlainTextSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public PlainTextSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 b9bde95..470b2c7 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
@@ -173,6 +173,12 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public OutputStreamSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public OutputStreamSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -190,6 +196,12 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public OutputStreamSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public OutputStreamSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -233,44 +245,38 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public OutputStreamSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public OutputStreamSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public OutputStreamSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public OutputStreamSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public OutputStreamSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public OutputStreamSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -311,20 +317,20 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public OutputStreamSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public OutputStreamSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public OutputStreamSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -341,8 +347,14 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public OutputStreamSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public OutputStreamSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -377,14 +389,14 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public OutputStreamSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public OutputStreamSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public OutputStreamSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 314c3ab..487f06e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -108,7 +108,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_addBeanTypes</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_addBeanTypes</jsf>)
* .build();
*
* <jc>// Our map of beans to serialize.</jc>
@@ -177,7 +177,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_addRootType</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_addRootType</jsf>)
* .build();
*
* <jc>// Our bean to serialize.</jc>
@@ -303,7 +303,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_keepNullProperties</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_keepNullProperties</jsf>)
* .build();
*
* <jc>// Our bean to serialize.</jc>
@@ -358,7 +358,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_sortCollections</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_sortCollections</jsf>)
* .build();
*
* <jc>// An unsorted array</jc>
@@ -411,7 +411,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_sortMaps</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_sortMaps</jsf>)
* .build();
*
* <jc>// An unsorted map.</jc>
@@ -470,7 +470,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_trimEmptyCollections</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_trimEmptyCollections</jsf>)
* .build();
*
* <jc>// A bean with a field with an empty array.</jc>
@@ -529,7 +529,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_trimEmptyMaps</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_trimEmptyMaps</jsf>)
* .build();
*
* <jc>// A bean with a field with an empty map.</jc>
@@ -581,7 +581,7 @@ public abstract class Serializer extends BeanTraverseContext {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_trimStrings</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_trimStrings</jsf>)
* .build();
*
* <jc>// A map with space-padded keys/values</jc>
@@ -826,18 +826,18 @@ public abstract class Serializer extends BeanTraverseContext {
protected Serializer(PropertyStore ps, String produces, String accept) {
super(ps);
- addBeanTypes = getBooleanProperty(SERIALIZER_addBeanTypes, false);
- keepNullProperties = getBooleanProperty(SERIALIZER_keepNullProperties, false);
- trimEmptyCollections = getBooleanProperty(SERIALIZER_trimEmptyCollections, false);
- trimEmptyMaps = getBooleanProperty(SERIALIZER_trimEmptyMaps, false);
- trimStrings = getBooleanProperty(SERIALIZER_trimStrings, false);
- sortCollections = getBooleanProperty(SERIALIZER_sortCollections, false);
- sortMaps = getBooleanProperty(SERIALIZER_sortMaps, false);
- addRootType = getBooleanProperty(SERIALIZER_addRootType, false);
+ addBeanTypes = getBooleanProperty(SERIALIZER_addBeanTypes);
+ keepNullProperties = getBooleanProperty(SERIALIZER_keepNullProperties);
+ trimEmptyCollections = getBooleanProperty(SERIALIZER_trimEmptyCollections);
+ trimEmptyMaps = getBooleanProperty(SERIALIZER_trimEmptyMaps);
+ trimStrings = getBooleanProperty(SERIALIZER_trimStrings);
+ sortCollections = getBooleanProperty(SERIALIZER_sortCollections);
+ sortMaps = getBooleanProperty(SERIALIZER_sortMaps);
+ addRootType = getBooleanProperty(SERIALIZER_addRootType);
uriContext = getProperty(SERIALIZER_uriContext, UriContext.class, UriContext.DEFAULT);
uriResolution = getProperty(SERIALIZER_uriResolution, UriResolution.class, UriResolution.NONE);
uriRelativity = getProperty(SERIALIZER_uriRelativity, UriRelativity.class, UriRelativity.RESOURCE);
- listener = getClassProperty(SERIALIZER_listener, SerializerListener.class, null);
+ listener = getClassProperty(SERIALIZER_listener, SerializerListener.class);
this.produces = MediaType.of(produces);
this.accept = accept == null ? MediaRanges.of(produces) : MediaRanges.of(accept);
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 a206b53..da57b39 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
@@ -96,7 +96,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder addBeanTypes() {
- return set(SERIALIZER_addBeanTypes, true);
+ return set(SERIALIZER_addBeanTypes);
}
/**
@@ -146,7 +146,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder addRootType() {
- return set(SERIALIZER_addRootType, true);
+ return set(SERIALIZER_addRootType);
}
/**
@@ -184,7 +184,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder keepNullProperties() {
- return set(SERIALIZER_keepNullProperties, true);
+ return set(SERIALIZER_keepNullProperties);
}
/**
@@ -274,7 +274,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder sortCollections() {
- return set(SERIALIZER_sortCollections, true);
+ return set(SERIALIZER_sortCollections);
}
/**
@@ -309,7 +309,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder sortMaps() {
- return set(SERIALIZER_sortMaps, true);
+ return set(SERIALIZER_sortMaps);
}
/**
@@ -352,7 +352,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder trimEmptyCollections() {
- return set(SERIALIZER_trimEmptyCollections, true);
+ return set(SERIALIZER_trimEmptyCollections);
}
/**
@@ -393,7 +393,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder trimEmptyMaps() {
- return set(SERIALIZER_trimEmptyMaps, true);
+ return set(SERIALIZER_trimEmptyMaps);
}
/**
@@ -425,7 +425,7 @@ public class SerializerBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerBuilder trimStrings() {
- return set(SERIALIZER_trimStrings, true);
+ return set(SERIALIZER_trimStrings);
}
/**
@@ -638,6 +638,12 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -655,6 +661,12 @@ public class SerializerBuilder extends BeanTraverseBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public SerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public SerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -698,44 +710,38 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public SerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public SerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public SerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public SerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public SerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public SerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -776,20 +782,20 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public SerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public SerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public SerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -806,8 +812,14 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public SerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public SerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -842,14 +854,14 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public SerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public SerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 7d9291e..da21db3 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
@@ -148,7 +148,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder addBeanTypes() {
- return set(SERIALIZER_addBeanTypes, true);
+ return set(SERIALIZER_addBeanTypes);
}
/**
@@ -165,7 +165,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder addRootType() {
- return set(SERIALIZER_addRootType, true);
+ return set(SERIALIZER_addRootType);
}
/**
@@ -182,7 +182,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder keepNullProperties() {
- return set(SERIALIZER_keepNullProperties, true);
+ return set(SERIALIZER_keepNullProperties);
}
/**
@@ -218,7 +218,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder sortCollections() {
- return set(SERIALIZER_sortCollections, true);
+ return set(SERIALIZER_sortCollections);
}
/**
@@ -235,7 +235,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder sortMaps() {
- return set(SERIALIZER_sortMaps, true);
+ return set(SERIALIZER_sortMaps);
}
/**
@@ -252,7 +252,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder trimEmptyCollections() {
- return set(SERIALIZER_trimEmptyCollections, true);
+ return set(SERIALIZER_trimEmptyCollections);
}
/**
@@ -269,7 +269,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder trimEmptyMaps() {
- return set(SERIALIZER_trimEmptyMaps, true);
+ return set(SERIALIZER_trimEmptyMaps);
}
/**
@@ -286,7 +286,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder trimStrings() {
- return set(SERIALIZER_trimStrings, true);
+ return set(SERIALIZER_trimStrings);
}
/**
@@ -488,7 +488,7 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
*/
@FluentSetter
public SerializerGroupBuilder useWhitespace() {
- return set(WSERIALIZER_useWhitespace, true);
+ return set(WSERIALIZER_useWhitespace);
}
/**
@@ -595,6 +595,12 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SerializerGroupBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SerializerGroupBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -612,6 +618,12 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public SerializerGroupBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public SerializerGroupBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -655,44 +667,38 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public SerializerGroupBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public SerializerGroupBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public SerializerGroupBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public SerializerGroupBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public SerializerGroupBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public SerializerGroupBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -733,20 +739,20 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public SerializerGroupBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public SerializerGroupBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public SerializerGroupBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -763,8 +769,14 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public SerializerGroupBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public SerializerGroupBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -799,14 +811,14 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder fluentSetters() {
- super.fluentSetters();
+ public SerializerGroupBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SerializerGroupBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public SerializerGroupBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index 19a5719..693038a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -279,7 +279,7 @@ public abstract class WriterSerializer extends Serializer {
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>WSERIALIZER_useWhitespace</jsf>, <jk>true</jk>)
+ * .set(<jsf>WSERIALIZER_useWhitespace</jsf>)
* .build();
*
* <jc>// A bean with a single property</jc>
@@ -343,7 +343,7 @@ public abstract class WriterSerializer extends Serializer {
quoteChar = getStringProperty(WSERIALIZER_quoteChar, "\"").charAt(0);
streamCharset = getProperty(WSERIALIZER_streamCharset, Charset.class, IOUtils.UTF8);
fileCharset = getProperty(WSERIALIZER_fileCharset, Charset.class, Charset.defaultCharset());
- useWhitespace = getBooleanProperty(WSERIALIZER_useWhitespace, false);
+ useWhitespace = getBooleanProperty(WSERIALIZER_useWhitespace);
}
//-----------------------------------------------------------------------------------------------------------------
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 5b07713..b0e087d 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
@@ -263,7 +263,7 @@ public class WriterSerializerBuilder extends SerializerBuilder {
*/
@FluentSetter
public WriterSerializerBuilder useWhitespace() {
- return set(WSERIALIZER_useWhitespace, true);
+ return set(WSERIALIZER_useWhitespace);
}
/**
@@ -387,6 +387,12 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public WriterSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public WriterSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -404,6 +410,12 @@ public class WriterSerializerBuilder extends SerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public WriterSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public WriterSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -447,44 +459,38 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public WriterSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public WriterSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public WriterSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public WriterSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public WriterSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public WriterSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -525,20 +531,20 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public WriterSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public WriterSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public WriterSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -555,8 +561,14 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public WriterSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public WriterSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -591,14 +603,14 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public WriterSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public WriterSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public WriterSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
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 f5af74d..56b518b 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
@@ -160,6 +160,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public SoapXmlSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public SoapXmlSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -177,6 +183,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public SoapXmlSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public SoapXmlSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -220,44 +232,38 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public SoapXmlSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public SoapXmlSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public SoapXmlSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public SoapXmlSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public SoapXmlSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public SoapXmlSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -298,20 +304,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public SoapXmlSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public SoapXmlSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public SoapXmlSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -328,8 +334,14 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public SoapXmlSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public SoapXmlSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -364,14 +376,14 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public SoapXmlSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public SoapXmlSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public SoapXmlSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 8003797..ec96653 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -81,7 +81,7 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
* <jc>// Same, but use property.</jc>
* ReaderParser p = UonParser.
* .<jsm>create</jsm>()
- * .set(<jsf>UON_decoding</jsf>, <jk>true</jk>)
+ * .set(<jsf>UON_decoding</jsf>)
* .build();
*
* <jc>// Produces: ["foo bar", "baz quz"].</jc>
@@ -128,7 +128,7 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
* <jc>// Same, but use property.</jc>
* ReaderParser p = UonParser.
* .<jsm>create</jsm>()
- * .set(<jsf>UON_validateEnd</jsf>, <jk>true</jk>)
+ * .set(<jsf>UON_validateEnd</jsf>)
* .build();
*
* <jc>// Should fail because input has multiple POJOs.</jc>
@@ -257,8 +257,8 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
*/
public UonParser(PropertyStore ps, String...consumes) {
super(ps, consumes);
- this.decoding = getBooleanProperty(UON_decoding, false);
- this.validateEnd = getBooleanProperty(UON_validateEnd, false);
+ this.decoding = getBooleanProperty(UON_decoding);
+ this.validateEnd = getBooleanProperty(UON_validateEnd);
}
@Override /* Context */
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 f2e6da2..e2b8da5 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
@@ -109,7 +109,7 @@ public class UonParserBuilder extends ReaderParserBuilder {
*/
@FluentSetter
public UonParserBuilder validateEnd() {
- return set(UON_validateEnd, true);
+ return set(UON_validateEnd);
}
// <FluentSetters>
@@ -199,6 +199,12 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UonParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UonParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -216,6 +222,12 @@ public class UonParserBuilder extends ReaderParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public UonParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public UonParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -259,44 +271,38 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public UonParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public UonParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public UonParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public UonParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public UonParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public UonParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -337,20 +343,20 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public UonParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public UonParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public UonParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -367,8 +373,14 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public UonParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public UonParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -403,14 +415,14 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder fluentSetters() {
- super.fluentSetters();
+ public UonParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public UonParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index b38e3c0..8bb54da 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -411,8 +411,8 @@ public class UonSerializer extends WriterSerializer implements HttpPartSerialize
*/
public UonSerializer(PropertyStore ps, String produces, String accept) {
super(ps, produces, accept);
- encoding = getBooleanProperty(UON_encoding, false);
- addBeanTypes = getBooleanProperty(UON_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes, false));
+ encoding = getBooleanProperty(UON_encoding);
+ addBeanTypes = getBooleanProperty(UON_addBeanTypes, getBooleanProperty(SERIALIZER_addBeanTypes));
paramFormat = getProperty(UON_paramFormat, ParamFormat.class, ParamFormat.UON);
quoteChar = getStringProperty(WSERIALIZER_quoteChar, "'").charAt(0);
}
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 6dae81d..1c2f15e 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
@@ -144,7 +144,7 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
*/
@FluentSetter
public UonSerializerBuilder encoding() {
- return set(UON_encoding, true);
+ return set(UON_encoding);
}
/**
@@ -320,6 +320,12 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UonSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UonSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -337,6 +343,12 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public UonSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public UonSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -380,44 +392,38 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public UonSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public UonSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public UonSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public UonSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public UonSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public UonSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -458,20 +464,20 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public UonSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public UonSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public UonSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -488,8 +494,14 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public UonSerializerBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public UonSerializerBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -524,14 +536,14 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder fluentSetters() {
- super.fluentSetters();
+ public UonSerializerBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UonSerializerBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public UonSerializerBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index cdd45f0..c9e1687 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -134,7 +134,7 @@ public class UrlEncodingParser extends UonParser implements UrlEncodingMetaProvi
.build(),
"application/x-www-form-urlencoded"
);
- expandedParams = getBooleanProperty(URLENC_expandedParams, false);
+ expandedParams = getBooleanProperty(URLENC_expandedParams);
}
@Override /* Context */
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 b7728e1..cbd71d4 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
@@ -70,7 +70,7 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
*/
@FluentSetter
public UrlEncodingParserBuilder expandedParams() {
- return set(URLENC_expandedParams, true);
+ return set(URLENC_expandedParams);
}
// <FluentSetters>
@@ -160,6 +160,12 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UrlEncodingParserBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UrlEncodingParserBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -177,6 +183,12 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public UrlEncodingParserBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public UrlEncodingParserBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -220,44 +232,38 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public UrlEncodingParserBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public UrlEncodingParserBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public UrlEncodingParserBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public UrlEncodingParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public UrlEncodingParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
+ public UrlEncodingParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
+ super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@@ -298,20 +304,20 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
+ public UrlEncodingParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
+ public UrlEncodingParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
+ public UrlEncodingParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
return this;
}
@@ -328,8 +334,14 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder disableSilentlyIgnoreMissingSetters() {
- super.disableSilentlyIgnoreMissingSetters();
+ public UrlEncodingParserBuilder disableBeansRequireSomeProperties() {
+ super.disableBeansRequireSomeProperties();
+ return this;
+ }
+
+ @Override /* GENERATED - BeanContextBuilder */
+ public UrlEncodingParserBuilder disableIgnoreMissingSetters() {
+ super.disableIgnoreMissingSetters();
return this;
}
@@ -364,14 +376,14 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder fluentSetters() {
- super.fluentSetters();
+ public UrlEncodingParserBuilder findFluentSetters() {
+ super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingParserBuilder fluentSetters(Class<?> on) {
- super.fluentSetters(on);
+ public UrlEncodingParserBuilder findFluentSetters(Class<?> on) {
+ super.findFluentSetters(on);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index a8f7c84..7af0083 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -306,7 +306,7 @@ public class UrlEncodingSerializer extends UonSerializer implements UrlEncodingM
produces,
accept
);
- expandedParams = getBooleanProperty(URLENC_expandedParams, false);
+ expandedParams = getBooleanProperty(URLENC_expandedParams);
}
@Override /* Context */
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 871729e..5a86208 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
@@ -70,7 +70,7 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
*/
@FluentSetter
public UrlEncodingSerializerBuilder expandedParams() {
- return set(URLENC_expandedParams, true);
+ return set(URLENC_expandedParams);
}
// <FluentSetters>
@@ -160,6 +160,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - ContextBuilder */
+ public UrlEncodingSerializerBuilder set(String name) {
+ super.set(name);
+ return this;
+ }
+
+ @Override /* GENERATED - ContextBuilder */
public UrlEncodingSerializerBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
@@ -177,6 +183,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
return this;
}
+ @Override /* GENERATED - ContextBuilder */
+ public UrlEncodingSerializerBuilder unset(String name) {
+ super.unset(name);
+ return this;
+ }
+
@Override /* GENERATED - BeanContextBuilder */
public UrlEncodingSerializerBuilder annotations(Annotation...values) {
super.annotations(values);
@@ -220,44 +232,38 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingSerializerBuilder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingSerializerBuilder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
+ public UrlEncodingSerializerBuilder beanProperties(Map<String,Object> values) {
+ super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingSerializerBuilder beansRequireSerializable() {
- super.beansRequireSerializable();
+ public UrlEncodingSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
+ super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingSerializerBuilder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
+ public UrlEncodingSerializerBuilder beanProperties(String beanClassName, String properties) {
+ super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingSerializerBuilder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
+ public UrlEncodingSerializerBuilder beanPropertiesExcludes(Map<String,Object> values) {
+ super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public UrlEncodingSerializerBuilder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
+ public UrlEncodingSerializerBuilder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ super.beanPropertiesExcludes(beanClass, properties);
return this;
}
... 1609 lines suppressed ...