juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Remove deprecated code.
Date Tue, 13 Oct 2020 17:19:06 GMT
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 d043438  Remove deprecated code.
d043438 is described below

commit d043438d483fc7574c7424a2c52d4d105ee12411
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 13:19:02 2020 -0400

    Remove deprecated code.
---
 .../serializer/OutputStreamSerializerBuilder.java  |  14 ---
 .../juneau/serializer/SerializerBuilder.java       | 112 ------------------
 .../juneau/serializer/SerializerGroupBuilder.java  | 126 ---------------------
 .../xmlschema/XmlSchemaSerializerBuilder.java      |  42 -------
 4 files changed, 294 deletions(-)

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 90dacd2..25ea161 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
@@ -86,20 +86,6 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
 		return set(OSSERIALIZER_binaryFormat, value);
 	}
 
-	/**
-	 * <i><l>OutputStreamSerializer</l> configuration property:&emsp;</i>
 Binary output format.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #binaryFormat(BinaryFormat)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public OutputStreamSerializerBuilder binaryFormat(String value) {
-		return set(OSSERIALIZER_binaryFormat, BinaryFormat.valueOf(value));
-	}
-
 	// <FluentSetters>
 
 	@Override /* GENERATED - ContextBuilder */
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 334f614..8c124eb 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
@@ -53,20 +53,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Add
<js>"_type"</js> properties when needed.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #addBeanTypes()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder addBeanTypes(boolean value) {
-		return set(SERIALIZER_addBeanTypes, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Add
<js>"_type"</js> properties when needed.
-	 *
 	 * <p>
 	 * When enabled, <js>"_type"</js> properties will be added to beans if their
type cannot be inferred
 	 * through reflection.
@@ -116,20 +102,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Add
type attribute to root nodes.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #addRootType()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder addRootType(boolean value) {
-		return set(SERIALIZER_addRootType, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Add
type attribute to root nodes.
-	 *
 	 * <p>
 	 * When enabled, <js>"_type"</js> properties will be added to top-level beans.
 	 *
@@ -180,20 +152,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Don't
trim null bean property values.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #keepNullProperties()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder keepNullProperties(boolean value) {
-		return set(SERIALIZER_keepNullProperties, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Don't
trim null bean property values.
-	 *
 	 * <p>
 	 * When enabled, null bean values will be serialized to the output.
 	 *
@@ -287,20 +245,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Sort
arrays and collections alphabetically.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #sortCollections()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder sortCollections(boolean value) {
-		return set(SERIALIZER_sortCollections, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Sort
arrays and collections alphabetically.
-	 *
 	 * <p>
 	 * When enabled, copies and sorts the contents of arrays and collections before serializing
them.
 	 *
@@ -336,20 +280,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Sort
maps alphabetically.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #sortMaps()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder sortMaps(boolean value) {
-		return set(SERIALIZER_sortMaps, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Sort
maps alphabetically.
-	 *
 	 * <p>
 	 * When enabled, copies and sorts the contents of maps by their keys before serializing
them.
 	 *
@@ -385,20 +315,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Trim
empty lists and arrays.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #trimEmptyCollections()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder trimEmptyCollections(boolean value) {
-		return set(SERIALIZER_trimEmptyCollections, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Trim
empty lists and arrays.
-	 *
 	 * <p>
 	 * When enabled, empty lists and arrays will not be serialized.
 	 *
@@ -442,20 +358,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Trim
empty maps.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #trimEmptyMaps()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder trimEmptyMaps(boolean value) {
-		return set(SERIALIZER_trimEmptyMaps, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Trim
empty maps.
-	 *
 	 * <p>
 	 * When enabled, empty map values will not be serialized to the output.
 	 *
@@ -497,20 +399,6 @@ public class SerializerBuilder extends BeanTraverseBuilder {
 	/**
 	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Trim
strings.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #trimStrings()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerBuilder trimStrings(boolean value) {
-		return set(SERIALIZER_trimStrings, value);
-	}
-
-	/**
-	 * <i><l>Serializer</l> configuration property:&emsp;</i>  Trim
strings.
-	 *
 	 * <p>
 	 * When enabled, string values will be trimmed of whitespace using {@link String#trim()}
before being serialized.
 	 *
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 76a12cd..e96e7e0 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
@@ -137,20 +137,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Add <js>"_type"</js> properties when needed.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #addBeanTypes()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder addBeanTypes(boolean value) {
-		return set(SERIALIZER_addBeanTypes, value);
-	}
-
-	/**
-	 * Configuration property:  Add <js>"_type"</js> properties when needed.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>addBeanTypes(<jk>true</jk>)</code>.
 	 *
@@ -168,20 +154,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Add type attribute to root nodes.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #addRootType()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder addRootType(boolean value) {
-		return set(SERIALIZER_addRootType, value);
-	}
-
-	/**
-	 * Configuration property:  Add type attribute to root nodes.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>addRootType(<jk>true</jk>)</code>.
 	 *
@@ -199,20 +171,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Don't trim null bean property values.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #keepNullProperties()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder keepNullProperties(boolean value) {
-		return set(SERIALIZER_keepNullProperties, value);
-	}
-
-	/**
-	 * Configuration property:  Don't trim null bean property values.
-	 *
 	 * <p>
 	 * When enabled, null bean values will be serialized to the output.
 	 *
@@ -249,20 +207,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Sort arrays and collections alphabetically.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #sortCollections()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder sortCollections(boolean value) {
-		return set(SERIALIZER_sortCollections, value);
-	}
-
-	/**
-	 * Configuration property:  Sort arrays and collections alphabetically.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>sortCollections(<jk>true</jk>)</code>.
 	 *
@@ -280,20 +224,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Sort maps alphabetically.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #sortMaps()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder sortMaps(boolean value) {
-		return set(SERIALIZER_sortMaps, value);
-	}
-
-	/**
-	 * Configuration property:  Sort maps alphabetically.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>sortMaps(<jk>true</jk>)</code>.
 	 *
@@ -311,20 +241,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Trim empty lists and arrays.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #trimEmptyCollections()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder trimEmptyCollections(boolean value) {
-		return set(SERIALIZER_trimEmptyCollections, value);
-	}
-
-	/**
-	 * Configuration property:  Trim empty lists and arrays.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>trimEmptyCollections(<jk>true</jk>)</code>.
 	 *
@@ -342,20 +258,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Trim empty maps.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #trimEmptyMaps()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder trimEmptyMaps(boolean value) {
-		return set(SERIALIZER_trimEmptyMaps, value);
-	}
-
-	/**
-	 * Configuration property:  Trim empty maps.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>trimEmptyMaps(<jk>true</jk>)</code>.
 	 *
@@ -373,20 +275,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Trim strings.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #trimStrings()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder trimStrings(boolean value) {
-		return set(SERIALIZER_trimStrings, value);
-	}
-
-	/**
-	 * Configuration property:  Trim strings.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>trimStrings(<jk>true</jk>)</code>.
 	 *
@@ -590,20 +478,6 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
 	/**
 	 * Configuration property:  Use whitespace.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #useWhitespace()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public SerializerGroupBuilder useWhitespace(boolean value) {
-		return set(WSERIALIZER_useWhitespace, value);
-	}
-
-	/**
-	 * Configuration property:  Use whitespace.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
 	 *
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
index 8df732b..6b2f1a6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
@@ -148,24 +148,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder
{
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder addBeanTypes(boolean value) {
-		super.addBeanTypes(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder addBeanTypes() {
 		super.addBeanTypes();
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder addRootType(boolean value) {
-		super.addRootType(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder addRootType() {
 		super.addRootType();
 		return this;
@@ -213,60 +201,30 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder
{
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder sortCollections() {
 		super.sortCollections();
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder sortMaps() {
 		super.sortMaps();
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder trimEmptyCollections(boolean value) {
-		super.trimEmptyCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder trimEmptyCollections() {
 		super.trimEmptyCollections();
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder trimEmptyMaps(boolean value) {
-		super.trimEmptyMaps(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder trimEmptyMaps() {
 		super.trimEmptyMaps();
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder trimStrings() {
 		super.trimStrings();
 		return this;


Mime
View raw message