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 2017/12/23 16:50:51 UTC
[10/21] juneau git commit: JUNEAU-76 Improvements to Context/Builder
APIs
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
----------------------------------------------------------------------
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 760ea06..5f0c051 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
@@ -51,7 +51,7 @@ import org.apache.juneau.parser.*;
* JSON objects (<js>"{...}"</js>) are converted to {@link ObjectMap ObjectMaps}.
* <b>Note:</b> If a <code><xa>_type</xa>=<xs>'xxx'</xs></code> attribute is specified on the object, then an
* attempt is made to convert the object to an instance of the specified Java bean class.
- * See the <code>beanTypeName</code> setting on the {@link PropertyStore} for more information about parsing
+ * See the <code>beanTypeName</code> setting on the {@link PropertyStore2} for more information about parsing
* beans from JSON.
* <li>
* JSON arrays (<js>"[...]"</js>) are converted to {@link ObjectList ObjectLists}.
@@ -105,10 +105,10 @@ public class JsonParser extends ReaderParser {
//-------------------------------------------------------------------------------------------------------------------
/** Default parser, all default settings.*/
- public static final JsonParser DEFAULT = new JsonParser(PropertyStore.create());
+ public static final JsonParser DEFAULT = new JsonParser(PropertyStore2.DEFAULT);
/** Default parser, all default settings.*/
- public static final JsonParser DEFAULT_STRICT = new JsonParser.Strict(PropertyStore.create());
+ public static final JsonParser DEFAULT_STRICT = new JsonParser.Strict(PropertyStore2.DEFAULT);
//-------------------------------------------------------------------------------------------------------------------
@@ -121,10 +121,10 @@ public class JsonParser extends ReaderParser {
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public Strict(PropertyStore propertyStore) {
- super(propertyStore.copy().append(PARSER_strict, true));
+ public Strict(PropertyStore2 ps) {
+ super(ps.builder().set(PARSER_strict, true).build());
}
}
@@ -133,31 +133,28 @@ public class JsonParser extends ReaderParser {
// Instance
//-------------------------------------------------------------------------------------------------------------------
- private final JsonParserContext ctx;
-
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public JsonParser(PropertyStore propertyStore) {
- this(propertyStore, "application/json", "text/json");
+ public JsonParser(PropertyStore2 ps) {
+ this(ps, "application/json", "text/json");
}
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
* @param consumes The list of media types that this parser consumes (e.g. <js>"application/json"</js>).
*/
- public JsonParser(PropertyStore propertyStore, String...consumes) {
- super(propertyStore, consumes);
- this.ctx = createContext(JsonParserContext.class);
+ public JsonParser(PropertyStore2 ps, String...consumes) {
+ super(ps, consumes);
}
- @Override /* CoreObject */
+ @Override /* Context */
public JsonParserBuilder builder() {
- return new JsonParserBuilder(propertyStore);
+ return new JsonParserBuilder(getPropertyStore());
}
/**
@@ -178,6 +175,12 @@ public class JsonParser extends ReaderParser {
@Override /* Parser */
public ReaderParserSession createSession(ParserSessionArgs args) {
- return new JsonParserSession(ctx, args);
+ return new JsonParserSession(this, args);
+ }
+
+ @Override /* Context */
+ public ObjectMap asMap() {
+ return super.asMap()
+ .append("JsonParser", new ObjectMap());
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
----------------------------------------------------------------------
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 d3eb7b8..2721b4e 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
@@ -33,15 +33,15 @@ public class JsonParserBuilder extends ParserBuilder {
/**
* Constructor.
*
- * @param propertyStore The initial configuration settings for this builder.
+ * @param ps The initial configuration settings for this builder.
*/
- public JsonParserBuilder(PropertyStore propertyStore) {
- super(propertyStore);
+ public JsonParserBuilder(PropertyStore2 ps) {
+ super(ps);
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParser build() {
- return new JsonParser(propertyStore);
+ return build(JsonParser.class);
}
@@ -85,380 +85,374 @@ public class JsonParserBuilder extends ParserBuilder {
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanMapPutReturnsOldValue(boolean value) {
super.beanMapPutReturnsOldValue(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanClassVisibility(Visibility value) {
super.beanClassVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanFieldVisibility(Visibility value) {
super.beanFieldVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder methodVisibility(Visibility value) {
super.methodVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder useJavaBeanIntrospector(boolean value) {
super.useJavaBeanIntrospector(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder ignoreUnknownBeanProperties(boolean value) {
super.ignoreUnknownBeanProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder ignorePropertiesWithoutSetters(boolean value) {
super.ignorePropertiesWithoutSetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder notBeanPackages(String...values) {
super.notBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder notBeanPackages(Collection<String> values) {
super.notBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setNotBeanPackages(String...values) {
super.setNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setNotBeanPackages(Collection<String> values) {
super.setNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeNotBeanPackages(String...values) {
super.removeNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeNotBeanPackages(Collection<String> values) {
super.removeNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder notBeanClasses(Class<?>...values) {
super.notBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder notBeanClasses(Collection<Class<?>> values) {
super.notBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setNotBeanClasses(Class<?>...values) {
super.setNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setNotBeanClasses(Collection<Class<?>> values) {
super.setNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeNotBeanClasses(Class<?>...values) {
super.removeNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeNotBeanClasses(Collection<Class<?>> values) {
super.removeNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanFilters(Class<?>...values) {
super.beanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanFilters(Collection<Class<?>> values) {
super.beanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setBeanFilters(Class<?>...values) {
super.setBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setBeanFilters(Collection<Class<?>> values) {
super.setBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeBeanFilters(Class<?>...values) {
super.removeBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeBeanFilters(Collection<Class<?>> values) {
super.removeBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder pojoSwaps(Class<?>...values) {
super.pojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder pojoSwaps(Collection<Class<?>> values) {
super.pojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setPojoSwaps(Class<?>...values) {
super.setPojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setPojoSwaps(Collection<Class<?>> values) {
super.setPojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removePojoSwaps(Class<?>...values) {
super.removePojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removePojoSwaps(Collection<Class<?>> values) {
super.removePojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder implClasses(Map<Class<?>,Class<?>> values) {
+ @Override /* ContextBuilder */
+ public JsonParserBuilder implClasses(Map<String,Class<?>> values) {
super.implClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public <T> JsonParserBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
super.implClass(interfaceClass, implClass);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanDictionary(Collection<Class<?>> values) {
super.beanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setBeanDictionary(Class<?>...values) {
super.setBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder setBeanDictionary(Collection<Class<?>> values) {
super.setBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeFromBeanDictionary(Class<?>...values) {
super.removeFromBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder removeFromBeanDictionary(Collection<Class<?>> values) {
super.removeFromBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder beanTypePropertyName(String value) {
super.beanTypePropertyName(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder defaultParser(Class<?> value) {
super.defaultParser(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder locale(Locale value) {
super.locale(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder timeZone(TimeZone value) {
super.timeZone(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder mediaType(MediaType value) {
super.mediaType(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonParserBuilder debug() {
super.debug();
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder property(String name, Object value) {
- super.property(name, value);
+ @Override /* ContextBuilder */
+ public JsonParserBuilder set(String name, Object value) {
+ super.set(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder properties(Map<String,Object> properties) {
- super.properties(properties);
+ @Override /* ContextBuilder */
+ public JsonParserBuilder set(Map<String,Object> properties) {
+ super.set(properties);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder addToProperty(String name, Object value) {
- super.addToProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonParserBuilder add(Map<String,Object> properties) {
+ super.add(properties);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder putToProperty(String name, Object key, Object value) {
- super.putToProperty(name, key, value);
+ @Override /* ContextBuilder */
+ public JsonParserBuilder addTo(String name, Object value) {
+ super.addTo(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder putToProperty(String name, Object value) {
- super.putToProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonParserBuilder addTo(String name, String key, Object value) {
+ super.addTo(name, key, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder removeFromProperty(String name, Object value) {
- super.removeFromProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonParserBuilder removeFrom(String name, Object value) {
+ super.removeFrom(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder classLoader(ClassLoader classLoader) {
- super.classLoader(classLoader);
- return this;
- }
-
- @Override /* CoreObjectBuilder */
- public JsonParserBuilder apply(PropertyStore copyFrom) {
+ @Override /* ContextBuilder */
+ public JsonParserBuilder apply(PropertyStore2 copyFrom) {
super.apply(copyFrom);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserContext.java
deleted file mode 100644
index af8ab7a..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserContext.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
-// * *
-// * http://www.apache.org/licenses/LICENSE-2.0 *
-// * *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
-// * specific language governing permissions and limitations under the License. *
-// ***************************************************************************************************************************
-package org.apache.juneau.json;
-
-import org.apache.juneau.*;
-import org.apache.juneau.parser.*;
-
-/**
- * Contains a snapshot-in-time read-only copy of the settings on the {@link JsonParser} class.
- */
-public final class JsonParserContext extends ParserContext {
-
- /**
- * Constructor.
- *
- * <p>
- * Typically only called from {@link PropertyStore#getContext(Class)}.
- *
- * @param ps The property store that created this context.
- */
- public JsonParserContext(PropertyStore ps) {
- super(ps);
- }
-
- @Override /* Context */
- public ObjectMap asMap() {
- return super.asMap()
- .append("JsonParserContext", new ObjectMap()
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index a5b61e7..ede380d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -44,7 +44,7 @@ public final class JsonParserSession extends ReaderParserSession {
* @param args
* Runtime session arguments.
*/
- protected JsonParserSession(JsonParserContext ctx, ParserSessionArgs args) {
+ protected JsonParserSession(JsonParser ctx, ParserSessionArgs args) {
super(ctx, args);
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index c8d55ee..93f01d3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -33,13 +33,14 @@ public final class JsonSchemaSerializer extends JsonSerializer {
/**
* Constructor.
*
- * @param propertyStore Initialize with the specified config property store.
+ * @param ps Initialize with the specified config property store.
*/
- public JsonSchemaSerializer(PropertyStore propertyStore) {
+ public JsonSchemaSerializer(PropertyStore2 ps) {
super(
- propertyStore.copy()
- .append(SERIALIZER_detectRecursions, true)
- .append(SERIALIZER_ignoreRecursions, true),
+ ps.builder()
+ .set(SERIALIZER_detectRecursions, true)
+ .set(SERIALIZER_ignoreRecursions, true)
+ .build(),
"application/json",
"application/json+schema", "text/json+schema"
);
@@ -47,6 +48,6 @@ public final class JsonSchemaSerializer extends JsonSerializer {
@Override /* Serializer */
public WriterSerializerSession createSession(SerializerSessionArgs args) {
- return new JsonSchemaSerializerSession(ctx, args);
+ return new JsonSchemaSerializerSession(this, args);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
----------------------------------------------------------------------
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 e15384a..544f8b8 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
@@ -33,15 +33,15 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
/**
* Constructor.
*
- * @param propertyStore The initial configuration settings for this builder.
+ * @param ps The initial configuration settings for this builder.
*/
- public JsonSchemaSerializerBuilder(PropertyStore propertyStore) {
- super(propertyStore);
+ public JsonSchemaSerializerBuilder(PropertyStore2 ps) {
+ super(ps);
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializer build() {
- return new JsonSchemaSerializer(propertyStore);
+ return build(JsonSchemaSerializer.class);
}
@@ -187,416 +187,410 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanMapPutReturnsOldValue(boolean value) {
super.beanMapPutReturnsOldValue(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanClassVisibility(Visibility value) {
super.beanClassVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanFieldVisibility(Visibility value) {
super.beanFieldVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder methodVisibility(Visibility value) {
super.methodVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder useJavaBeanIntrospector(boolean value) {
super.useJavaBeanIntrospector(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder ignoreUnknownBeanProperties(boolean value) {
super.ignoreUnknownBeanProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder ignorePropertiesWithoutSetters(boolean value) {
super.ignorePropertiesWithoutSetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder notBeanPackages(String...values) {
super.notBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder notBeanPackages(Collection<String> values) {
super.notBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setNotBeanPackages(String...values) {
super.setNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setNotBeanPackages(Collection<String> values) {
super.setNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeNotBeanPackages(String...values) {
super.removeNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeNotBeanPackages(Collection<String> values) {
super.removeNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder notBeanClasses(Class<?>...values) {
super.notBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder notBeanClasses(Collection<Class<?>> values) {
super.notBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setNotBeanClasses(Class<?>...values) {
super.setNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setNotBeanClasses(Collection<Class<?>> values) {
super.setNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeNotBeanClasses(Class<?>...values) {
super.removeNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeNotBeanClasses(Collection<Class<?>> values) {
super.removeNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanFilters(Class<?>...values) {
super.beanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanFilters(Collection<Class<?>> values) {
super.beanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setBeanFilters(Class<?>...values) {
super.setBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setBeanFilters(Collection<Class<?>> values) {
super.setBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeBeanFilters(Class<?>...values) {
super.removeBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeBeanFilters(Collection<Class<?>> values) {
super.removeBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder pojoSwaps(Class<?>...values) {
super.pojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder pojoSwaps(Collection<Class<?>> values) {
super.pojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setPojoSwaps(Class<?>...values) {
super.setPojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setPojoSwaps(Collection<Class<?>> values) {
super.setPojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removePojoSwaps(Class<?>...values) {
super.removePojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removePojoSwaps(Collection<Class<?>> values) {
super.removePojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder implClasses(Map<Class<?>,Class<?>> values) {
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder implClasses(Map<String,Class<?>> values) {
super.implClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public <T> JsonSchemaSerializerBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
super.implClass(interfaceClass, implClass);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder includeProperties(Map<String,String> values) {
super.includeProperties(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder includeProperties(String beanClassName, String properties) {
super.includeProperties(beanClassName, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
super.includeProperties(beanClass, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder excludeProperties(Map<String,String> values) {
super.excludeProperties(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder excludeProperties(String beanClassName, String properties) {
super.excludeProperties(beanClassName, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
super.excludeProperties(beanClass, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanDictionary(Collection<Class<?>> values) {
super.beanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setBeanDictionary(Class<?>...values) {
super.setBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder setBeanDictionary(Collection<Class<?>> values) {
super.setBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeFromBeanDictionary(Class<?>...values) {
super.removeFromBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder removeFromBeanDictionary(Collection<Class<?>> values) {
super.removeFromBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder beanTypePropertyName(String value) {
super.beanTypePropertyName(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder defaultParser(Class<?> value) {
super.defaultParser(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder timeZone(TimeZone value) {
super.timeZone(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder mediaType(MediaType value) {
super.mediaType(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder debug() {
super.debug();
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder property(String name, Object value) {
- super.property(name, value);
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder set(String name, Object value) {
+ super.set(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder properties(Map<String,Object> properties) {
- super.properties(properties);
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder set(Map<String,Object> properties) {
+ super.set(properties);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder addToProperty(String name, Object value) {
- super.addToProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder add(Map<String,Object> properties) {
+ super.add(properties);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder putToProperty(String name, Object key, Object value) {
- super.putToProperty(name, key, value);
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder addTo(String name, Object value) {
+ super.addTo(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder putToProperty(String name, Object value) {
- super.putToProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder addTo(String name, String key, Object value) {
+ super.addTo(name, key, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder removeFromProperty(String name, Object value) {
- super.removeFromProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder removeFrom(String name, Object value) {
+ super.removeFrom(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder classLoader(ClassLoader classLoader) {
- super.classLoader(classLoader);
- return this;
- }
-
- @Override /* CoreObjectBuilder */
- public JsonSchemaSerializerBuilder apply(PropertyStore copyFrom) {
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder apply(PropertyStore2 copyFrom) {
super.apply(copyFrom);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
index 9ca88ea..9f24afd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
@@ -41,7 +41,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession {
* It also include session-level properties that override the properties defined on the bean and
* serializer contexts.
*/
- protected JsonSchemaSerializerSession(JsonSerializerContext ctx, SerializerSessionArgs args) {
+ protected JsonSchemaSerializerSession(JsonSerializer ctx, SerializerSessionArgs args) {
super(ctx, args);
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
----------------------------------------------------------------------
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 9fdec76..6711f08 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
@@ -53,7 +53,7 @@ import org.apache.juneau.serializer.*;
* The types above are considered "JSON-primitive" object types.
* Any non-JSON-primitive object types are transformed into JSON-primitive object types through
* {@link org.apache.juneau.transform.PojoSwap PojoSwaps} associated through the
- * {@link CoreObjectBuilder#pojoSwaps(Class...)} method.
+ * {@link BeanContextBuilder#pojoSwaps(Class...)} method.
* Several default transforms are provided for transforming Dates, Enums, Iterators, etc...
*
* <p>
@@ -98,7 +98,7 @@ public class JsonSerializer extends WriterSerializer {
* <b>Configuration property:</b> Simple JSON mode.
*
* <ul>
- * <li><b>Name:</b> <js>"JsonSerializer.simpleMode"</js>
+ * <li><b>Name:</b> <js>"JsonSerializer.simpleMode.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
@@ -108,13 +108,13 @@ public class JsonSerializer extends WriterSerializer {
* If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
* Otherwise, they are always quoted.
*/
- public static final String JSON_simpleMode = PREFIX + "simpleMode";
+ public static final String JSON_simpleMode = PREFIX + "simpleMode.b";
/**
* <b>Configuration property:</b> Prefix solidus <js>'/'</js> characters with escapes.
*
* <ul>
- * <li><b>Name:</b> <js>"JsonSerializer.escapeSolidus"</js>
+ * <li><b>Name:</b> <js>"JsonSerializer.escapeSolidus.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
@@ -126,13 +126,13 @@ public class JsonSerializer extends WriterSerializer {
* However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to serialize
* <xt><\/script></xt>.
*/
- public static final String JSON_escapeSolidus = PREFIX + "escapeSolidus";
+ public static final String JSON_escapeSolidus = PREFIX + "escapeSolidus.b";
/**
* <b>Configuration property:</b> Add <js>"_type"</js> properties when needed.
*
* <ul>
- * <li><b>Name:</b> <js>"JsonSerializer.addBeanTypeProperties"</js>
+ * <li><b>Name:</b> <js>"JsonSerializer.addBeanTypeProperties.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
@@ -149,7 +149,7 @@ public class JsonSerializer extends WriterSerializer {
* When present, this value overrides the {@link #SERIALIZER_addBeanTypeProperties} setting and is
* provided to customize the behavior of specific serializers in a {@link SerializerGroup}.
*/
- public static final String JSON_addBeanTypeProperties = PREFIX + "addBeanTypeProperties";
+ public static final String JSON_addBeanTypeProperties = PREFIX + "addBeanTypeProperties.b";
//-------------------------------------------------------------------------------------------------------------------
@@ -157,22 +157,22 @@ public class JsonSerializer extends WriterSerializer {
//-------------------------------------------------------------------------------------------------------------------
/** Default serializer, all default settings.*/
- public static final JsonSerializer DEFAULT = new JsonSerializer(PropertyStore.create());
+ public static final JsonSerializer DEFAULT = new JsonSerializer(PropertyStore2.DEFAULT);
/** Default serializer, all default settings.*/
- public static final JsonSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());
+ public static final JsonSerializer DEFAULT_READABLE = new Readable(PropertyStore2.DEFAULT);
/** Default serializer, single quotes, simple mode. */
- public static final JsonSerializer DEFAULT_LAX = new Simple(PropertyStore.create());
+ public static final JsonSerializer DEFAULT_LAX = new Simple(PropertyStore2.DEFAULT);
/** Default serializer, single quotes, simple mode, with whitespace. */
- public static final JsonSerializer DEFAULT_LAX_READABLE = new SimpleReadable(PropertyStore.create());
+ public static final JsonSerializer DEFAULT_LAX_READABLE = new SimpleReadable(PropertyStore2.DEFAULT);
/**
* Default serializer, single quotes, simple mode, with whitespace and recursion detection.
* Note that recursion detection introduces a small performance penalty.
*/
- public static final JsonSerializer DEFAULT_LAX_READABLE_SAFE = new SimpleReadableSafe(PropertyStore.create());
+ public static final JsonSerializer DEFAULT_LAX_READABLE_SAFE = new SimpleReadableSafe(PropertyStore2.DEFAULT);
//-------------------------------------------------------------------------------------------------------------------
@@ -185,12 +185,11 @@ public class JsonSerializer extends WriterSerializer {
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public Readable(PropertyStore propertyStore) {
+ public Readable(PropertyStore2 ps) {
super(
- propertyStore.copy()
- .append(SERIALIZER_useWhitespace, true)
+ ps.builder().set(SERIALIZER_useWhitespace, true).build()
);
}
}
@@ -201,13 +200,14 @@ public class JsonSerializer extends WriterSerializer {
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public Simple(PropertyStore propertyStore) {
+ public Simple(PropertyStore2 ps) {
super(
- propertyStore.copy()
- .append(JSON_simpleMode, true)
- .append(SERIALIZER_quoteChar, '\''),
+ ps.builder()
+ .set(JSON_simpleMode, true)
+ .set(SERIALIZER_quoteChar, '\'')
+ .build(),
"application/json",
"application/json+simple", "application/json+simple+*", "text/json+simple", "text/json+simple+*"
);
@@ -220,14 +220,15 @@ public class JsonSerializer extends WriterSerializer {
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public SimpleReadable(PropertyStore propertyStore) {
+ public SimpleReadable(PropertyStore2 ps) {
super(
- propertyStore.copy()
- .append(JSON_simpleMode, true)
- .append(SERIALIZER_quoteChar, '\'')
- .append(SERIALIZER_useWhitespace, true)
+ ps.builder()
+ .set(JSON_simpleMode, true)
+ .set(SERIALIZER_quoteChar, '\'')
+ .set(SERIALIZER_useWhitespace, true)
+ .build()
);
}
}
@@ -241,15 +242,16 @@ public class JsonSerializer extends WriterSerializer {
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public SimpleReadableSafe(PropertyStore propertyStore) {
+ public SimpleReadableSafe(PropertyStore2 ps) {
super(
- propertyStore.copy()
- .append(JSON_simpleMode, true)
- .append(SERIALIZER_quoteChar, '\'')
- .append(SERIALIZER_useWhitespace, true)
- .append(SERIALIZER_detectRecursions, true)
+ ps.builder()
+ .set(JSON_simpleMode, true)
+ .set(SERIALIZER_quoteChar, '\'')
+ .set(SERIALIZER_useWhitespace, true)
+ .set(SERIALIZER_detectRecursions, true)
+ .build()
);
}
}
@@ -259,23 +261,27 @@ public class JsonSerializer extends WriterSerializer {
// Instance
//-------------------------------------------------------------------------------------------------------------------
- final JsonSerializerContext ctx;
+ final boolean
+ simpleMode,
+ escapeSolidus,
+ addBeanTypeProperties;
+
private volatile JsonSchemaSerializer schemaSerializer;
/**
* Constructor.
*
- * @param propertyStore
+ * @param ps
* The property store containing all the settings for this object.
*/
- public JsonSerializer(PropertyStore propertyStore) {
- this(propertyStore, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");
+ public JsonSerializer(PropertyStore2 ps) {
+ this(ps, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");
}
/**
* Constructor.
*
- * @param propertyStore
+ * @param ps
* The property store containing all the settings for this object.
* @param produces
* The media type that this serializer produces.
@@ -293,14 +299,17 @@ public class JsonSerializer extends WriterSerializer {
* <br>...or...
* <br><code><jk>super</jk>(propertyStore, <js>"application/json"</js>, <js>"*​/json"</js>);</code>
*/
- public JsonSerializer(PropertyStore propertyStore, String produces, String...accept) {
- super(propertyStore, produces, accept);
- this.ctx = createContext(JsonSerializerContext.class);
+ public JsonSerializer(PropertyStore2 ps, String produces, String...accept) {
+ super(ps, produces, accept);
+
+ simpleMode = getProperty(JSON_simpleMode, boolean.class, false);
+ escapeSolidus = getProperty(JSON_escapeSolidus, boolean.class, false);
+ addBeanTypeProperties = getProperty(JSON_addBeanTypeProperties, boolean.class, getProperty(SERIALIZER_addBeanTypeProperties, boolean.class, true));
}
- @Override /* CoreObject */
+ @Override /* Context */
public JsonSerializerBuilder builder() {
- return new JsonSerializerBuilder(propertyStore);
+ return new JsonSerializerBuilder(getPropertyStore());
}
/**
@@ -326,7 +335,7 @@ public class JsonSerializer extends WriterSerializer {
*/
public JsonSchemaSerializer getSchemaSerializer() {
if (schemaSerializer == null)
- schemaSerializer = new JsonSchemaSerializer(propertyStore);
+ schemaSerializer = builder().build(JsonSchemaSerializer.class);
return schemaSerializer;
}
@@ -336,6 +345,16 @@ public class JsonSerializer extends WriterSerializer {
@Override /* Serializer */
public WriterSerializerSession createSession(SerializerSessionArgs args) {
- return new JsonSerializerSession(ctx, args);
+ return new JsonSerializerSession(this, args);
+ }
+
+ @Override /* Context */
+ public ObjectMap asMap() {
+ return super.asMap()
+ .append("JsonSerializer", new ObjectMap()
+ .append("simpleMode", simpleMode)
+ .append("escapeSolidus", escapeSolidus)
+ .append("addBeanTypeProperties", addBeanTypeProperties)
+ );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
----------------------------------------------------------------------
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 e411b91..8e1a539 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
@@ -35,15 +35,15 @@ public class JsonSerializerBuilder extends SerializerBuilder {
/**
* Constructor.
*
- * @param propertyStore The initial configuration settings for this builder.
+ * @param ps The initial configuration settings for this builder.
*/
- public JsonSerializerBuilder(PropertyStore propertyStore) {
- super(propertyStore);
+ public JsonSerializerBuilder(PropertyStore2 ps) {
+ super(ps);
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializer build() {
- return new JsonSerializer(propertyStore);
+ return build(JsonSerializer.class);
}
@@ -54,13 +54,6 @@ public class JsonSerializerBuilder extends SerializerBuilder {
/**
* <b>Configuration property:</b> Simple JSON mode.
*
- * <ul>
- * <li><b>Name:</b> <js>"JsonSerializer.simpleMode"</js>
- * <li><b>Data type:</b> <code>Boolean</code>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session-overridable:</b> <jk>true</jk>
- * </ul>
- *
* <p>
* If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
* Otherwise, they are always quoted.
@@ -75,7 +68,7 @@ public class JsonSerializerBuilder extends SerializerBuilder {
* @see JsonSerializer#JSON_simpleMode
*/
public JsonSerializerBuilder simple(boolean value) {
- return property(JSON_simpleMode, value);
+ return set(JSON_simpleMode, value);
}
/**
@@ -90,13 +83,6 @@ public class JsonSerializerBuilder extends SerializerBuilder {
/**
* <b>Configuration property:</b> Prefix solidus <js>'/'</js> characters with escapes.
*
- * <ul>
- * <li><b>Name:</b> <js>"JsonSerializer.escapeSolidus"</js>
- * <li><b>Data type:</b> <code>Boolean</code>
- * <li><b>Default:</b> <jk>false</jk>
- * <li><b>Session-overridable:</b> <jk>true</jk>
- * </ul>
- *
* <p>
* If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
* The JSON specification allows for either format.
@@ -113,7 +99,7 @@ public class JsonSerializerBuilder extends SerializerBuilder {
* @see JsonSerializer#JSON_escapeSolidus
*/
public JsonSerializerBuilder escapeSolidus(boolean value) {
- return property(JSON_escapeSolidus, value);
+ return set(JSON_escapeSolidus, value);
}
@Override /* SerializerBuilder */
@@ -242,416 +228,410 @@ public class JsonSerializerBuilder extends SerializerBuilder {
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanMapPutReturnsOldValue(boolean value) {
super.beanMapPutReturnsOldValue(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanClassVisibility(Visibility value) {
super.beanClassVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanFieldVisibility(Visibility value) {
super.beanFieldVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder methodVisibility(Visibility value) {
super.methodVisibility(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder useJavaBeanIntrospector(boolean value) {
super.useJavaBeanIntrospector(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder ignoreUnknownBeanProperties(boolean value) {
super.ignoreUnknownBeanProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder ignorePropertiesWithoutSetters(boolean value) {
super.ignorePropertiesWithoutSetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder notBeanPackages(String...values) {
super.notBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder notBeanPackages(Collection<String> values) {
super.notBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setNotBeanPackages(String...values) {
super.setNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setNotBeanPackages(Collection<String> values) {
super.setNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeNotBeanPackages(String...values) {
super.removeNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeNotBeanPackages(Collection<String> values) {
super.removeNotBeanPackages(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder notBeanClasses(Class<?>...values) {
super.notBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder notBeanClasses(Collection<Class<?>> values) {
super.notBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setNotBeanClasses(Class<?>...values) {
super.setNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setNotBeanClasses(Collection<Class<?>> values) {
super.setNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeNotBeanClasses(Class<?>...values) {
super.removeNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeNotBeanClasses(Collection<Class<?>> values) {
super.removeNotBeanClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanFilters(Class<?>...values) {
super.beanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanFilters(Collection<Class<?>> values) {
super.beanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setBeanFilters(Class<?>...values) {
super.setBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setBeanFilters(Collection<Class<?>> values) {
super.setBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeBeanFilters(Class<?>...values) {
super.removeBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeBeanFilters(Collection<Class<?>> values) {
super.removeBeanFilters(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder pojoSwaps(Class<?>...values) {
super.pojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder pojoSwaps(Collection<Class<?>> values) {
super.pojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setPojoSwaps(Class<?>...values) {
super.setPojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setPojoSwaps(Collection<Class<?>> values) {
super.setPojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removePojoSwaps(Class<?>...values) {
super.removePojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removePojoSwaps(Collection<Class<?>> values) {
super.removePojoSwaps(values);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder implClasses(Map<Class<?>,Class<?>> values) {
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder implClasses(Map<String,Class<?>> values) {
super.implClasses(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public <T> JsonSerializerBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
super.implClass(interfaceClass, implClass);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder includeProperties(Map<String,String> values) {
super.includeProperties(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder includeProperties(String beanClassName, String properties) {
super.includeProperties(beanClassName, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
super.includeProperties(beanClass, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder excludeProperties(Map<String,String> values) {
super.excludeProperties(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder excludeProperties(String beanClassName, String properties) {
super.excludeProperties(beanClassName, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
super.excludeProperties(beanClass, properties);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanDictionary(Collection<Class<?>> values) {
super.beanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setBeanDictionary(Class<?>...values) {
super.setBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder setBeanDictionary(Collection<Class<?>> values) {
super.setBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeFromBeanDictionary(Class<?>...values) {
super.removeFromBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder removeFromBeanDictionary(Collection<Class<?>> values) {
super.removeFromBeanDictionary(values);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder beanTypePropertyName(String value) {
super.beanTypePropertyName(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder defaultParser(Class<?> value) {
super.defaultParser(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder timeZone(TimeZone value) {
super.timeZone(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder mediaType(MediaType value) {
super.mediaType(value);
return this;
}
- @Override /* CoreObjectBuilder */
+ @Override /* ContextBuilder */
public JsonSerializerBuilder debug() {
super.debug();
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder property(String name, Object value) {
- super.property(name, value);
- return this;
- }
-
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder properties(Map<String,Object> properties) {
- super.properties(properties);
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder set(String name, Object value) {
+ super.set(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder addToProperty(String name, Object value) {
- super.addToProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder set(Map<String,Object> properties) {
+ super.set(properties);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder putToProperty(String name, Object key, Object value) {
- super.putToProperty(name, key, value);
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder add(Map<String,Object> properties) {
+ super.add(properties);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder putToProperty(String name, Object value) {
- super.putToProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder addTo(String name, Object value) {
+ super.addTo(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder removeFromProperty(String name, Object value) {
- super.removeFromProperty(name, value);
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder addTo(String name, String key, Object value) {
+ super.addTo(name, key, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder classLoader(ClassLoader classLoader) {
- super.classLoader(classLoader);
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder removeFrom(String name, Object value) {
+ super.removeFrom(name, value);
return this;
}
- @Override /* CoreObjectBuilder */
- public JsonSerializerBuilder apply(PropertyStore copyFrom) {
+ @Override /* ContextBuilder */
+ public JsonSerializerBuilder apply(PropertyStore2 copyFrom) {
super.apply(copyFrom);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerContext.java
deleted file mode 100644
index 599e5cc..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerContext.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
-// * *
-// * http://www.apache.org/licenses/LICENSE-2.0 *
-// * *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
-// * specific language governing permissions and limitations under the License. *
-// ***************************************************************************************************************************
-package org.apache.juneau.json;
-
-import static org.apache.juneau.json.JsonSerializer.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.serializer.*;
-
-/**
- * Contains a snapshot-in-time read-only copy of the settings on the {@link JsonSerializer} class.
- */
-public final class JsonSerializerContext extends SerializerContext {
-
- final boolean
- simpleMode,
- escapeSolidus,
- addBeanTypeProperties;
-
- /**
- * Constructor.
- *
- * <p>
- * Typically only called from {@link PropertyStore#getContext(Class)}.
- *
- * @param ps The property store that created this context.
- */
- public JsonSerializerContext(PropertyStore ps) {
- super(ps);
- simpleMode = ps.getProperty(JSON_simpleMode, boolean.class, false);
- escapeSolidus = ps.getProperty(JSON_escapeSolidus, boolean.class, false);
- addBeanTypeProperties = ps.getProperty(JSON_addBeanTypeProperties, boolean.class,
- ps.getProperty(SERIALIZER_addBeanTypeProperties, boolean.class, true));
- }
-
- @Override /* Context */
- public ObjectMap asMap() {
- return super.asMap()
- .append("JsonSerializerContext", new ObjectMap()
- .append("simpleMode", simpleMode)
- .append("escapeSolidus", escapeSolidus)
- .append("addBeanTypeProperties", addBeanTypeProperties)
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 0083dab..1ea85b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -47,12 +47,11 @@ public class JsonSerializerSession extends WriterSerializerSession {
* It also include session-level properties that override the properties defined on the bean and
* serializer contexts.
*/
- protected JsonSerializerSession(JsonSerializerContext ctx, SerializerSessionArgs args) {
+ protected JsonSerializerSession(JsonSerializer ctx, SerializerSessionArgs args) {
super(ctx, args);
- ObjectMap p = getProperties();
- simpleMode = p.getBoolean(JSON_simpleMode, ctx.simpleMode);
- escapeSolidus = p.getBoolean(JSON_escapeSolidus, ctx.escapeSolidus);
- addBeanTypeProperties = p.getBoolean(JSON_addBeanTypeProperties, ctx.addBeanTypeProperties);
+ simpleMode = getProperty(JSON_simpleMode, boolean.class, ctx.simpleMode);
+ escapeSolidus = getProperty(JSON_escapeSolidus, boolean.class, ctx.escapeSolidus);
+ addBeanTypeProperties = getProperty(JSON_addBeanTypeProperties, boolean.class, ctx.addBeanTypeProperties);
}
@Override /* Session */
http://git-wip-us.apache.org/repos/asf/juneau/blob/227719b2/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index cf15e8a..dbecaf4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -29,28 +29,25 @@ public class MsgPackParser extends InputStreamParser {
//-------------------------------------------------------------------------------------------------------------------
/** Default parser, all default settings.*/
- public static final MsgPackParser DEFAULT = new MsgPackParser(PropertyStore.create());
+ public static final MsgPackParser DEFAULT = new MsgPackParser(PropertyStore2.DEFAULT);
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
- private final MsgPackParserContext ctx;
-
/**
* Constructor.
*
- * @param propertyStore The property store containing all the settings for this object.
+ * @param ps The property store containing all the settings for this object.
*/
- public MsgPackParser(PropertyStore propertyStore) {
- super(propertyStore, "octal/msgpack");
- this.ctx = createContext(MsgPackParserContext.class);
+ public MsgPackParser(PropertyStore2 ps) {
+ super(ps, "octal/msgpack");
}
@Override /* CoreObject */
public MsgPackParserBuilder builder() {
- return new MsgPackParserBuilder(propertyStore);
+ return new MsgPackParserBuilder(getPropertyStore());
}
/**
@@ -71,6 +68,12 @@ public class MsgPackParser extends InputStreamParser {
@Override /* Parser */
public MsgPackParserSession createSession(ParserSessionArgs args) {
- return new MsgPackParserSession(ctx, args);
+ return new MsgPackParserSession(this, args);
+ }
+
+ @Override /* Context */
+ public ObjectMap asMap() {
+ return super.asMap()
+ .append("MsgPackParser", new ObjectMap());
}
}