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 cd43ee9 Remove deprecated code.
cd43ee9 is described below
commit cd43ee912c10977b9e6a6942b917c9397976c6ac
Author: JamesBognar <[email protected]>
AuthorDate: Tue Oct 13 12:29:51 2020 -0400
Remove deprecated code.
---
.../apache/juneau/BeanConfigAnnotationTest.java | 8 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 3 -
.../java/org/apache/juneau/annotation/Bean.java | 35 ---
.../apache/juneau/annotation/BeanAnnotation.java | 51 ----
.../org/apache/juneau/annotation/BeanConfig.java | 260 ---------------------
.../apache/juneau/annotation/BeanConfigApply.java | 25 --
.../transform/AnnotationBeanFilterBuilder.java | 10 -
.../transform/InterfaceBeanFilterBuilder.java | 10 -
8 files changed, 4 insertions(+), 398 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
index a504f53..96998e7 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
@@ -122,10 +122,10 @@ public class BeanConfigAnnotationTest {
beansRequireSettersForGetters="$X{true}",
beansRequireSomeProperties="$X{true}",
typePropertyName="$X{foo}",
- bpiMap=@CS(k=A1.class,v="$X{foo}"),
- bpxMap=@CS(k=A1.class,v="$X{bar}"),
- bproMap=@CS(k=A1.class,v="$X{baz}"),
- bpwoMap=@CS(k=A1.class,v="$X{qux}"),
+ bpi="A1:$X{foo}",
+ bpx="A1:$X{bar}",
+ bpro="A1:$X{baz}",
+ bpwo="A1:$X{qux}",
debug="$X{true}",
detectRecursions="$X{true}",
examples="$X{A1}: {foo:1}",
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 733ad4f..3b2a814 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -350,7 +350,6 @@ public final class ClassMeta<T> implements Type {
Object example;
Mutater<String,T> stringMutater;
- @SuppressWarnings("deprecation")
ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext,
Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?>[] swaps,
PojoSwap<?,?>[] childPojoSwaps, Object example) {
this.innerClass = innerClass;
this.beanContext = beanContext;
@@ -616,8 +615,6 @@ public final class ClassMeta<T> implements Type {
if (bc != null) {
for (Bean b : bc.getAnnotations(Bean.class, c))
{
- if (b.beanDictionary().length != 0)
- beanRegistry = new
BeanRegistry(bc, null, b.beanDictionary());
if (b.dictionary().length != 0)
beanRegistry = new
BeanRegistry(bc, null, b.dictionary());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index 90ab007..9c1450f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -39,23 +39,6 @@ import org.apache.juneau.transform.*;
public @interface Bean {
/**
- * Bean dictionary.
- *
- * <p>
- * The list of classes that make up the bean dictionary for all
properties in this class and all subclasses.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - {@link #dictionary()}.
- * </div>
- */
- @Deprecated
- Class<?>[] beanDictionary() default {};
-
- /**
* Bean property includes.
*
* <p>
@@ -166,15 +149,6 @@ public @interface Bean {
Class<?>[] dictionary() default {};
/**
- * Specifies a list of properties that should be excluded from {@link
BeanMap#entrySet()}.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - {@link #bpx()}.
- * </div>
- */
- @Deprecated String excludeProperties() default "";
-
- /**
* Find fluent setters.
*
* <p>
@@ -308,15 +282,6 @@ public @interface Bean {
String on() default "";
/**
- * The set and order of names of properties associated with a bean
class.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - {@link #bpi()}.
- * </div>
- */
- @Deprecated String properties() default "";
-
- /**
* Associates a {@link PropertyNamer} with this bean to tailor the
names of the bean properties.
*
* <p>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
index ccb55d9..31d19fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
@@ -29,7 +29,6 @@ public class BeanAnnotation implements Bean {
private String on = "";
private Class<?>[]
- beanDictionary = new Class[0],
dictionary = new Class[0];
private Class<?>
interfaceClass = Object.class,
@@ -43,8 +42,6 @@ public class BeanAnnotation implements Bean {
bpx = "",
bpro = "",
bpwo = "",
- excludeProperties = "",
- properties = "",
typeName = "",
typePropertyName = "";
boolean
@@ -75,22 +72,6 @@ public class BeanAnnotation implements Bean {
}
@Override
- public Class<?>[] beanDictionary() {
- return beanDictionary;
- }
-
- /**
- * Sets the <c>beanDictionary</c> property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- */
- public BeanAnnotation beanDictionary(Class<?>...value) {
- this.beanDictionary = value;
- return this;
- }
-
- @Override
public String bpi() {
return bpi;
}
@@ -171,22 +152,6 @@ public class BeanAnnotation implements Bean {
}
@Override
- public String excludeProperties() {
- return excludeProperties;
- }
-
- /**
- * Sets the <c>excludeProperties</c> property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- */
- public BeanAnnotation excludeProperties(String value) {
- this.excludeProperties = value;
- return this;
- }
-
- @Override
public boolean fluentSetters() {
return fluentSetters;
}
@@ -246,22 +211,6 @@ public class BeanAnnotation implements Bean {
}
@Override
- public String properties() {
- return properties;
- }
-
- /**
- * Sets the <c>properties</c> property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- */
- public BeanAnnotation properties(String value) {
- this.properties = value;
- return this;
- }
-
- @Override
public Class<? extends BeanInterceptor<?>> interceptor() {
return interceptor;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 6d0b999..a548a48 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -228,62 +228,6 @@ public @interface BeanConfig {
String beanConstructorVisibility() default "";
/**
- * Configuration property: Bean dictionary.
- *
- * <p>
- * The list of classes that make up the bean dictionary in this bean
context.
- *
- * <p>
- * A dictionary is a name/class mapping used to find class types during
parsing when they cannot be inferred
- * through reflection.
- * <br>The names are defined through the {@link Bean#typeName()
@Bean(typeName)} annotation defined on the bean class.
- * <br>For example, if a class <c>Foo</c> has a type-name of
<js>"myfoo"</js>, then it would end up serialized
- * as <js>"{_type:'myfoo',...}"</js>.
- *
- * <p>
- * This setting tells the parsers which classes to look for when
resolving <js>"_type"</js> attributes.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
- * <li class='link'>{@doc BeanDictionaries}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary()}.
- * </div>
- */
- @Deprecated
- Class<?>[] beanDictionary() default {};
-
- /**
- * Configuration property: Add to bean dictionary.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary_replace()}.
- * </div>
- */
- @Deprecated
- Class<?>[] beanDictionary_replace() default {};
-
- /**
- * Configuration property: Remove from bean dictionary.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_beanDictionary_remove}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #dictionary_remove()}.
- * </div>
- */
- @Deprecated
- Class<?>[] beanDictionary_remove() default {};
-
- /**
* Configuration property: Minimum bean field visibility.
*
* <p>
@@ -606,44 +550,6 @@ public @interface BeanConfig {
String[] bpi() default {};
/**
- * Configuration property: Bean property includes.
- *
- * <p>
- * Specifies the set and order of names of properties associated with
the bean class.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <ja>@BeanConfig</ja>(
- * bpiMap={
- * <ja>@CS</ja>(key=MyBean.<jk>class</jk>,
value=<js>"foo,bar"</js>)
- * }
- * )
- * <p>
- *
- * <ul class='notes'>
- * <li>
- * Keys are the class applied to.
- * <br>Values are comma-delimited lists of property names.
- * <li>
- * Setting applies to specified class and all subclasses.
- * <li>
- * Supports {@doc DefaultVarResolver} (e.g.
<js>"$C{myConfigVar}"</js>).
- * </ul>
- *
- * <ul class='seealso'>
- * <li class='jm'>{@link BeanContextBuilder#bpi(Class, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpi(String, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpi(Map)}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #applyBean()} and {@link
Bean#bpi()}.
- * </div>
- */
- @Deprecated
- CS[] bpiMap() default {};
-
- /**
* Configuration property: Bean property excludes.
*
* Shortcut for specifying the {@link Bean#bpx()} annotation for all
serializers.
@@ -705,44 +611,6 @@ public @interface BeanConfig {
String[] bpx() default {};
/**
- * Configuration property: Bean property excludes.
- *
- * <p>
- * Specifies to exclude the specified list of properties for the
specified bean class.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <ja>@BeanConfig</ja>(
- * bpxMap={
- * <ja>@CS</ja>(key=MyBean.<jk>class</jk>,
value=<js>"foo,bar"</js>)
- * }
- * )
- * <p>
- *
- * <ul class='notes'>
- * <li>
- * Keys are the class applied to.
- * <br>Values are comma-delimited lists of property names.
- * <li>
- * Setting applies to specified class and all subclasses.
- * <li>
- * Supports {@doc DefaultVarResolver} (e.g.
<js>"$C{myConfigVar}"</js>).
- * </ul>
- *
- * <ul class='seealso'>
- * <li class='jm'>{@link BeanContextBuilder#bpx(Class, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpx(String, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpx(Map)}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #applyBean()} and {@link
Bean#bpx()}.
- * </div>
- */
- @Deprecated
- CS[] bpxMap() default {};
-
- /**
* Configuration property: Read-only bean properties.
*
* Shortcut for specifying the {@link Bean#bpwo()} annotation for all
parsers.
@@ -788,45 +656,6 @@ public @interface BeanConfig {
String[] bpro() default {};
/**
- * Configuration property: Read-only bean properties.
- *
- * Shortcut for specifying the {@link Bean#bpro()} annotation for all
parsers.
- *
- * <p>
- * Specifies one or more properties on a bean that are read-only
despite having valid getters.
- * Serializers will serialize such properties as usual, but parsers
will silently ignore them.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <jc>// Ignore 'a' and 'b' properties if they're present in the
HTTP request body.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>,
path=<js>"/mybeans"</js>)
- *
<ja>@BeanConfig</ja>(bproMap={<ja>@CS</ja>(MyBean.<jk>class</jk>,
<js>"a,b"</js>)})
- * <jk>public void</jk> postMyBeans(List<MyBean> l) {...}
- * </p>
- *
- * <ul class='notes'>
- * <li>
- * Values are comma-delimited lists of bean property names.
- * <li>
- * Properties apply to specified class and all subclasses.
- * <li>
- * Supports {@doc DefaultVarResolver} (e.g.
<js>"$C{myConfigVar}"</js>).
- * </ul>
- *
- * <ul class='seealso'>
- * <li class='jm'>{@link BeanContextBuilder#bpro(Class, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpro(String, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpro(Map)}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #applyBean()} and {@link
Bean#bpi()}.
- * </div>
- */
- @Deprecated
- CS[] bproMap() default {};
-
- /**
* Configuration property: Write-only bean properties.
*
* Shortcut for specifying the {@link Bean#bpwo()} annotation for all
serializers.
@@ -872,45 +701,6 @@ public @interface BeanConfig {
String[] bpwo() default {};
/**
- * Configuration property: Write-only bean properties.
- *
- * Shortcut for specifying the {@link Bean#bpwo()} annotation for all
serializers.
- *
- * <p>
- * Specifies one or more properties on a bean that are write-only
despite having valid setters.
- * Parsers will parse such properties as usual, but serializers will
silently ignore them.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <jc>// Ignore 'a' and 'b' properties if they're present in the
HTTP request body.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>,
path=<js>"/mybeans"</js>)
- *
<ja>@BeanConfig</ja>(bpwoMap={<ja>@CS</ja>(MyBean.<jk>class</jk>,
<js>"a,b"</js>)})
- * <jk>public void</jk> List<MyBean> getMyBeans() {...}
- * </p>
- *
- * <ul class='notes'>
- * <li>
- * Values are comma-delimited lists of bean property names.
- * <li>
- * Properties apply to specified class and all subclasses.
- * <li>
- * Supports {@doc DefaultVarResolver} (e.g.
<js>"$C{myConfigVar}"</js>).
- * </ul>
- *
- * <ul class='seealso'>
- * <li class='jm'>{@link BeanContextBuilder#bpwo(Class, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpwo(String, String)}
- * <li class='jm'>{@link BeanContextBuilder#bpwo(Map)}
- * </ul>
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #applyBean()} and {@link
Bean#bpwo()}.
- * </div>
- */
- @Deprecated
- CS[] bpwoMap() default {};
-
- /**
* Configuration property: Debug mode.
*
* <p>
@@ -1063,15 +853,6 @@ public @interface BeanConfig {
String[] examples() default {};
/**
- * Configuration property: Bean property excludes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - {@link #bpxMap()}.
- * </div>
- */
- @Deprecated CS[] excludeProperties() default {};
-
- /**
* Configuration property: Find fluent setters.
*
* <p>
@@ -1270,15 +1051,6 @@ public @interface BeanConfig {
CC[] implClasses() default {};
/**
- * Configuration property: Bean property includes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - {@link #bpiMap()}.
- * </div>
- */
- @Deprecated CS[] includeProperties() default {};
-
- /**
* Identifies a set of interfaces.
*
* <p>
@@ -1438,38 +1210,6 @@ public @interface BeanConfig {
String[] notBeanPackages_remove() default {};
/**
- * Configuration property: POJO swaps.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link BeanConfig#swaps()}
- * </div>
- */
- @Deprecated
- Class<? extends PojoSwap<?,?>>[] pojoSwaps() default {};
-
- /**
- * Configuration property: Add to POJO swap classes.
- *
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link BeanConfig#swaps_replace()}
- * </div>
- */
- @Deprecated
- Class<? extends PojoSwap<?,?>>[] pojoSwaps_replace() default {};
-
- /**
- * Configuration property: Remove from POJO swap classes.
- *
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link BeanConfig#swaps_remove()}
- * </div>
- */
- @Deprecated
- Class<? extends PojoSwap<?,?>>[] pojoSwaps_remove() default {};
-
- /**
* Configuration property: Bean property namer.
*
* <p>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
index 54dd69b..e31d9e5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
@@ -44,17 +44,6 @@ public class BeanConfigApply extends ConfigApply<BeanConfig>
{
public void apply(AnnotationInfo<BeanConfig> ai, PropertyStoreBuilder
psb) {
BeanConfig a = ai.getAnnotation();
- for (CS e : a.excludeProperties())
- psb.putTo(BEAN_bpx, e.k().getName(), string(e.v()));
- for (CS e : a.includeProperties())
- psb.putTo(BEAN_bpi, e.k().getName(), string(e.v()));
- if (a.beanDictionary().length != 0)
- psb.prependTo(BEAN_beanDictionary, a.beanDictionary());
- if (a.beanDictionary_replace().length != 0)
- psb.set(BEAN_beanDictionary,
a.beanDictionary_replace());
- if (a.beanDictionary_remove().length != 0)
- psb.removeFrom(BEAN_beanDictionary,
a.beanDictionary_remove());
-
if (! a.beanClassVisibility().isEmpty())
psb.set(BEAN_beanClassVisibility,
visibility(a.beanClassVisibility(), "beanClassVisibility"));
if (! a.beanConstructorVisibility().isEmpty())
@@ -127,12 +116,6 @@ public class BeanConfigApply extends
ConfigApply<BeanConfig> {
psb.set(BEAN_notBeanPackages,
strings(a.notBeanPackages_replace()));
if (a.notBeanPackages_remove().length != 0)
psb.removeFrom(BEAN_notBeanPackages,
strings(a.notBeanPackages_remove()));
- if (a.pojoSwaps().length != 0)
- psb.prependTo(BEAN_pojoSwaps, a.pojoSwaps());
- if (a.pojoSwaps_replace().length != 0)
- psb.set(BEAN_pojoSwaps, a.pojoSwaps_replace());
- if (a.pojoSwaps_remove().length != 0)
- psb.removeFrom(BEAN_pojoSwaps, a.pojoSwaps_remove());
if (a.propertyNamer() != PropertyNamer.Null.class)
psb.set(BEAN_propertyNamer, a.propertyNamer());
if (! a.sortProperties().isEmpty())
@@ -182,26 +165,18 @@ public class BeanConfigApply extends
ConfigApply<BeanConfig> {
if (a.bpi().length > 0)
for (Map.Entry<String,String> e : stringsMap(a.bpi(),
"bpi").entrySet())
psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.getKey()).bpi(e.getValue()));
- for (CS e : a.bpiMap())
- psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.k().getName()).bpi(e.v()));
if (a.bpx().length > 0)
for (Map.Entry<String,String> e : stringsMap(a.bpx(),
"bpx").entrySet())
psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.getKey()).bpx(e.getValue()));
- for (CS e : a.bpxMap())
- psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.k().getName()).bpx(e.v()));
if (a.bpro().length > 0)
for (Map.Entry<String,String> e : stringsMap(a.bpro(),
"bpro").entrySet())
psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.getKey()).bpro(e.getValue()));
- for (CS e : a.bproMap())
- psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.k().getName()).bpro(e.v()));
if (a.bpwo().length > 0)
for (Map.Entry<String,String> e : stringsMap(a.bpwo(),
"bpwo").entrySet())
psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.getKey()).bpwo(e.getValue()));
- for (CS e : a.bpwoMap())
- psb.prependTo(BEAN_annotations, new
BeanAnnotation(e.k().getName()).bpwo(e.v()));
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
index fcf3c6e..c3951eb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
@@ -37,15 +37,11 @@ public final class AnnotationBeanFilterBuilder<T> extends
BeanFilterBuilder<T> {
* The {@link Bean @Bean} annotations found on the class and all
parent classes in child-to-parent order.
* @throws Exception Thrown from property namer constructor.
*/
- @SuppressWarnings("deprecation")
public AnnotationBeanFilterBuilder(Class<T> annotatedClass, List<Bean>
annotations) throws Exception {
super(annotatedClass);
for (Bean b : annotations) {
- if (! b.properties().isEmpty())
- bpi(split(b.properties()));
-
if (! b.bpi().isEmpty())
bpi(split(b.bpi()));
@@ -58,9 +54,6 @@ public final class AnnotationBeanFilterBuilder<T> extends
BeanFilterBuilder<T> {
if (b.fluentSetters())
fluentSetters(true);
- if (! b.excludeProperties().isEmpty())
- bpx(split(b.excludeProperties()));
-
if (! b.bpx().isEmpty())
bpx(split(b.bpx()));
@@ -79,9 +72,6 @@ public final class AnnotationBeanFilterBuilder<T> extends
BeanFilterBuilder<T> {
if (b.stopClass() != Object.class)
stopClass(b.stopClass());
- if (b.beanDictionary().length > 0)
- dictionary(b.beanDictionary());
-
if (b.dictionary().length > 0)
dictionary(b.dictionary());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
index 9590a29..2f436bc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
@@ -52,19 +52,12 @@ public class InterfaceBeanFilterBuilder<T> extends
BeanFilterBuilder<T> {
init(interfaceClass, bc);
}
- @SuppressWarnings("deprecation")
private void init(Class<?> interfaceClass, BeanContext bc) {
interfaceClass(interfaceClass);
List<Bean> annotations =
ClassInfo.of(interfaceClass).getAnnotations(Bean.class, bc);
for (Bean b : annotations) {
- if (! b.properties().isEmpty())
- bpi(split(b.properties()));
-
- if (! b.excludeProperties().isEmpty())
- bpx(split(b.excludeProperties()));
-
if (! b.bpi().isEmpty())
bpi(split(b.bpi()));
@@ -99,9 +92,6 @@ public class InterfaceBeanFilterBuilder<T> extends
BeanFilterBuilder<T> {
if (b.stopClass() != Object.class)
stopClass(b.stopClass());
- if (b.beanDictionary().length > 0)
- dictionary(b.beanDictionary());
-
if (b.dictionary().length > 0)
dictionary(b.dictionary());
}
