Rename properties/excludeProperties to bpi/bpx.
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index 3a30de1..94d0123 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -519,7 +519,7 @@
}
public static class D2Filter extends BeanFilterBuilder<D2> {
public D2Filter() {
- properties("f3,f2");
+ bpi("f3,f2");
}
}
@@ -581,7 +581,7 @@
}
public static class E2Filter extends BeanFilterBuilder<E2> {
public E2Filter() {
- excludeProperties("f2");
+ bpx("f2");
}
}
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 f8991a9..7bb947a 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
@@ -866,7 +866,7 @@
* <li class='jm'>{@link BeanContextBuilder#excludeProperties(Class, String)}
* <li class='jm'>{@link BeanContextBuilder#excludeProperties(String, String)}
* <li class='jm'>{@link BeanContextBuilder#excludeProperties(Map)}
- * <li class='jm'>{@link BeanFilterBuilder#excludeProperties(String...)}
+ * <li class='jm'>{@link BeanFilterBuilder#bpx(String...)}
* </ul>
* </ul>
*
@@ -1207,7 +1207,7 @@
* <li class='jm'>{@link BeanContextBuilder#includeProperties(Class, String)}
* <li class='jm'>{@link BeanContextBuilder#includeProperties(String, String)}
* <li class='jm'>{@link BeanContextBuilder#includeProperties(Map)}
- * <li class='jm'>{@link BeanFilterBuilder#properties(String...)}
+ * <li class='jm'>{@link BeanFilterBuilder#bpi(String...)}
* </ul>
* </ul>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
index 94b9a66..78f2364 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
@@ -49,8 +49,8 @@
BeanFilter(BeanFilterBuilder<?> builder) {
this.beanClass = builder.beanClass;
this.typeName = builder.typeName;
- this.properties = split(builder.includeProperties, ',');
- this.excludeProperties = split(builder.excludeProperties, ',');
+ this.properties = split(builder.bpi, ',');
+ this.excludeProperties = split(builder.bpx, ',');
this.interfaceClass = builder.interfaceClass;
this.stopClass = builder.stopClass;
this.sortProperties = builder.sortProperties;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index 85b0a03..40e60a5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -58,7 +58,7 @@
Class<?> beanClass;
String typeName;
- String[] includeProperties, excludeProperties;
+ String[] bpi, bpx;
Class<?> interfaceClass, stopClass;
boolean sortProperties, fluentSetters;
Object propertyNamer;
@@ -155,9 +155,11 @@
* The new value for this setting.
* <br>Values can contain comma-delimited list of property names.
* @return This object (for method chaining).
+ * @deprecated Use {@link #bpi(String...)}
*/
+ @Deprecated
public BeanFilterBuilder<T> properties(String...value) {
- this.includeProperties = value;
+ this.bpi = value;
return this;
}
@@ -195,9 +197,11 @@
* The new value for this setting.
* <br>Values can contain comma-delimited list of property names.
* @return This object (for method chaining).
+ * @deprecated Use {@link #bpx(String...)}
*/
+ @Deprecated
public BeanFilterBuilder<T> excludeProperties(String...value) {
- this.excludeProperties = value;
+ this.bpx = value;
return this;
}
@@ -520,6 +524,86 @@
}
/**
+ * 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'>
+ * <jc>// Define our filter.</jc>
+ * <jk>public class</jk> MyFilter <jk>extends</jk> BeanFilterBuilder<MyBean> {
+ * <jk>public</jk> MyFilter() {
+ * bpi(<js>"foo,bar,baz"</js>);
+ * }
+ * }
+ *
+ * <jc>// Register it with a serializer.</jc>
+ * WriterSerializer s = JsonSerializer
+ * .<jsm>create</jsm>()
+ * .beanFilters(MyFilter.<jk>class</jk>)
+ * .build();
+ *
+ * <jc>// Only serializes the properties 'foo', 'bar', and 'baz'.</jc>
+ * String json = s.serialize(<jk>new</jk> MyBean());
+ * </p>
+ *
+ * <ul class='seealso'>
+ * <li class='ja'>{@link Bean#bpi()}
+ * <li class='jf'>{@link BeanContext#BEAN_includeProperties}
+ * </ul>
+ *
+ * @param value
+ * The new value for this setting.
+ * <br>Values can contain comma-delimited list of property names.
+ * @return This object (for method chaining).
+ */
+ public BeanFilterBuilder<T> bpi(String...value) {
+ this.bpi = value;
+ return this;
+ }
+
+ /**
+ * Configuration property: Bean property excludes.
+ *
+ * <p>
+ * Specifies properties to exclude from the bean class.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <jc>// Define our filter.</jc>
+ * <jk>public class</jk> MyFilter <jk>extends</jk> BeanFilterBuilder<MyBean> {
+ * <jk>public</jk> MyFilter() {
+ * bpx(<js>"foo,bar"</js>);
+ * }
+ * }
+ *
+ * <jc>// Register it with a serializer.</jc>
+ * WriterSerializer s = JsonSerializer
+ * .<jsm>create</jsm>()
+ * .beanFilters(MyFilter.<jk>class</jk>)
+ * .build();
+ *
+ * <jc>// Serializes all properties except for 'foo' and 'bar'.</jc>
+ * String json = s.serialize(<jk>new</jk> MyBean());
+ * </p>
+ *
+ * <ul class='seealso'>
+ * <li class='ja'>{@link Bean#bpx()}
+ * <li class='jf'>{@link BeanContext#BEAN_excludeProperties}
+ * </ul>
+ *
+ * @param value
+ * The new value for this setting.
+ * <br>Values can contain comma-delimited list of property names.
+ * @return This object (for method chaining).
+ */
+ public BeanFilterBuilder<T> bpx(String...value) {
+ this.bpx = value;
+ return this;
+ }
+
+ /**
* Configuration property: Bean dictionary.
*
* <p>
