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 43b7683 Remove deprecated code.
43b7683 is described below
commit 43b7683bc73c9f75bc869b9ad92219bcb277768c
Author: JamesBognar <[email protected]>
AuthorDate: Tue Oct 13 14:26:28 2020 -0400
Remove deprecated code.
---
.../main/java/org/apache/juneau/BeanContext.java | 18 -
.../java/org/apache/juneau/BeanContextBuilder.java | 403 ---------------------
2 files changed, 421 deletions(-)
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 0eaee4d..59eae57 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
@@ -1225,15 +1225,6 @@ public class BeanContext extends Context implements
MetaProvider {
public static final String BEAN_examples = PREFIX + ".examples.smo";
/**
- * Configuration property: Bean property excludes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #BEAN_bpx}
- * </div>
- */
- @Deprecated public static final String BEAN_excludeProperties =
BEAN_bpx;
-
- /**
* Configuration property: Find fluent setters.
*
* <h5 class='section'>Property:</h5>
@@ -1692,15 +1683,6 @@ public class BeanContext extends Context implements
MetaProvider {
public static final String BEAN_implClasses = PREFIX +
".implClasses.smc";
/**
- * Configuration property: Bean property includes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #BEAN_bpi}
- * </div>
- */
- @Deprecated public static final String BEAN_includeProperties =
BEAN_bpi;
-
- /**
* Configuration property: Bean class exclusions.
*
* <h5 class='section'>Property:</h5>
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 38e7572..c03e875 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
@@ -383,93 +383,6 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary(Object...)}
- * </div>
- *
- * @param values
- * The values to add to this property.
- * @return This object (for method chaining).
- */
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beanDictionary(Object...values) {
- return prependTo(BEAN_beanDictionary, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary(Object...)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beanDictionary(Class<?>...values) {
- return prependTo(BEAN_beanDictionary, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary(Object...)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beanDictionaryReplace(Class<?>...values) {
- return set(BEAN_beanDictionary, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary(Object...)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beanDictionaryReplace(Object...values) {
- return set(BEAN_beanDictionary, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary(Object...)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beanDictionaryRemove(Class<?>...values) {
- return removeFrom(BEAN_beanDictionary, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary(Object...)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beanDictionaryRemove(Object...values) {
- return removeFrom(BEAN_beanDictionary, values);
- }
-
- /**
* <i><l>BeanContext</l> configuration property: </i> Minimum
bean field visibility.
*
* <p>
@@ -632,20 +545,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i>
BeanMap.put() returns old property value.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #beanMapPutReturnsOldValue()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated
- public BeanContextBuilder beanMapPutReturnsOldValue(boolean value) {
- return set(BEAN_beanMapPutReturnsOldValue, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i>
BeanMap.put() returns old property value.
- *
* <p>
* When enabled, then the {@link BeanMap#put(String,Object)
BeanMap.put()} method will return old property
* values. Otherwise, it returns <jk>null</jk>.
@@ -739,20 +638,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Beans
require no-arg constructors.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link
#beansRequireDefaultConstructor()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beansRequireDefaultConstructor(boolean value)
{
- return set(BEAN_beansRequireDefaultConstructor, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Beans
require no-arg constructors.
- *
* <p>
* When enabled, a Java class must implement a default no-arg
constructor to be considered a bean.
* Otherwise, the bean will be serialized as a string using the {@link
Object#toString()} method.
@@ -811,20 +696,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Beans
require Serializable interface.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #beansRequireSerializable()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beansRequireSerializable(boolean value) {
- return set(BEAN_beansRequireSerializable, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Beans
require Serializable interface.
- *
* <p>
* When enabled, a Java class must implement the {@link Serializable}
interface to be considered a bean.
* Otherwise, the bean will be serialized as a string using the {@link
Object#toString()} method.
@@ -878,20 +749,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Beans
require setters for getters.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #beansRequireSettersForGetters()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beansRequireSettersForGetters(boolean value) {
- return set(BEAN_beansRequireSettersForGetters, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Beans
require setters for getters.
- *
* <p>
* When enabled, ignore read-only properties (properties with getters
but not setters).
*
@@ -943,20 +800,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Beans
require at least one property.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link
#beansDontRequireSomeProperties()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder beansRequireSomeProperties(boolean value) {
- return set(BEAN_beansRequireSomeProperties, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Beans
require at least one property.
- *
* <p>
* When enabled, then a Java class must contain at least 1 property to
be considered a bean.
* Otherwise, the bean will be serialized as a string using the {@link
Object#toString()} method.
@@ -1697,20 +1540,6 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * <i><l>BeanContext</l> configuration property: </i> Debug mode.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #debug()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder debug(boolean value) {
- return set(CONTEXT_debug, value);
- }
-
- /**
* <i><l>BeanContext</l> configuration property: </i> Bean
dictionary.
*
* <p>
@@ -1950,59 +1779,6 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * <i><l>BeanContext</l> configuration property: </i> Bean
property excludes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #bpx(Class, String)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated public BeanContextBuilder excludeProperties(Class<?>
beanClass, String properties) {
- return putTo(BEAN_bpx, beanClass.getName(), properties);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
property excludes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #bpx(Map)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated public BeanContextBuilder
excludeProperties(Map<String,String> values) {
- return set(BEAN_bpx, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
property excludes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #bpx(String, String)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated public BeanContextBuilder excludeProperties(String
beanClassName, String value) {
- return putTo(BEAN_bpx, beanClassName, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Find fluent
setters.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #fluentSetters()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder fluentSetters(boolean value) {
- return set(BEAN_fluentSetters, value);
- }
-
- /**
* <i><l>BeanContext</l> configuration property: </i> Find fluent
setters.
*
* <p>
@@ -2099,20 +1875,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Ignore
invocation errors on getters.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link
#ignoreInvocationExceptionsOnGetters()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder ignoreInvocationExceptionsOnGetters(boolean
value) {
- return set(BEAN_ignoreInvocationExceptionsOnGetters, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Ignore
invocation errors on getters.
- *
* <p>
* When enabled, errors thrown when calling bean getter methods will
silently be ignored.
* Otherwise, a {@code BeanRuntimeException} is thrown.
@@ -2156,20 +1918,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Ignore
invocation errors on setters.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link
#ignoreInvocationExceptionsOnSetters()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder ignoreInvocationExceptionsOnSetters(boolean
value) {
- return set(BEAN_ignoreInvocationExceptionsOnSetters, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Ignore
invocation errors on setters.
- *
* <p>
* When enabled, errors thrown when calling bean setter methods will
silently be ignored.
* Otherwise, a {@code BeanRuntimeException} is thrown.
@@ -2213,20 +1961,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Ignore
properties without setters.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link
#dontIgnorePropertiesWithoutSetters()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder ignorePropertiesWithoutSetters(boolean value)
{
- return set(BEAN_ignorePropertiesWithoutSetters, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Ignore
properties without setters.
- *
* <p>
* When enabled, trying to set a value on a bean property without a
setter will silently be ignored.
* Otherwise, a {@code BeanRuntimeException} is thrown.
@@ -2274,20 +2008,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Ignore
transient fields.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dontIgnoreTransientFields()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder ignoreTransientFields(boolean value) {
- return set(BEAN_ignoreTransientFields, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Ignore
transient fields.
- *
* <p>
* When enabled, methods and fields marked as <jk>transient</jk> will
be ignored as bean properties.
*
@@ -2332,20 +2052,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Ignore
unknown properties.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #ignoreUnknownBeanProperties()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder ignoreUnknownBeanProperties(boolean value) {
- return set(BEAN_ignoreUnknownBeanProperties, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Ignore
unknown properties.
- *
* <p>
* When enabled, trying to set a value on a non-existent bean property
will silently be ignored.
* Otherwise, a {@code BeanRuntimeException} is thrown.
@@ -2387,20 +2093,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Ignore
unknown properties with null values.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link
#dontIgnoreUnknownNullBeanProperties()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder ignoreUnknownNullBeanProperties(boolean
value) {
- return set(BEAN_ignoreUnknownNullBeanProperties, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Ignore
unknown properties with null values.
- *
* <p>
* When enabled, trying to set a <jk>null</jk> value on a non-existent
bean property will silently be ignored.
* Otherwise, a {@code BeanRuntimeException} is thrown.
@@ -2540,45 +2232,6 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * <i><l>BeanContext</l> configuration property: </i> Bean
property includes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #bpi(Class, String)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated public BeanContextBuilder includeProperties(Class<?>
beanClass, String value) {
- return putTo(BEAN_bpi, beanClass.getName(), value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
property includes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #bpi(Map)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated public BeanContextBuilder
includeProperties(Map<String,String> values) {
- return set(BEAN_bpi, values);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Bean
property includes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #bpi(String, String)}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @FluentSetter
- @Deprecated public BeanContextBuilder includeProperties(String
beanClassName, String value) {
- return putTo(BEAN_bpi, beanClassName, value);
- }
-
- /**
* Identifies a class to be used as the interface class for the
specified class and all subclasses.
*
* <p>
@@ -2894,20 +2547,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Sort bean
properties.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #sortProperties()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder sortProperties(boolean value) {
- return set(BEAN_sortProperties, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Sort bean
properties.
- *
* <p>
* When enabled, all bean properties will be serialized and access in
alphabetical order.
* Otherwise, the natural order of the bean properties is used which is
dependent on the JVM vendor.
@@ -3288,20 +2927,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Use enum
names.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #useEnumNames()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder useEnumNames(boolean value) {
- return set(BEAN_useEnumNames, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Use enum
names.
- *
* <p>
* When enabled, enums are always serialized by name, not using {@link
Object#toString()}.
*
@@ -3353,20 +2978,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Use
interface proxies.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dontUseInterfaceProxies()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder useInterfaceProxies(boolean value) {
- return set(BEAN_useInterfaceProxies, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Use
interface proxies.
- *
* <p>
* When enabled, interfaces will be instantiated as proxy classes
through the use of an
* {@link InvocationHandler} if there is no other way of instantiating
them.
@@ -3409,20 +3020,6 @@ public class BeanContextBuilder extends ContextBuilder {
/**
* <i><l>BeanContext</l> configuration property: </i> Use Java
Introspector.
*
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #useJavaBeanIntrospector()}
- * </div>
- */
- @SuppressWarnings("javadoc")
- @Deprecated
- @FluentSetter
- public BeanContextBuilder useJavaBeanIntrospector(boolean value) {
- return set(BEAN_useJavaBeanIntrospector, value);
- }
-
- /**
- * <i><l>BeanContext</l> configuration property: </i> Use Java
Introspector.
- *
* <p>
* Using the built-in Java bean introspector will not pick up fields or
non-standard getters/setters.
* <br>Most {@link Bean @Bean} annotations will be ignored.
