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 18:21:18 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 6e48702  Remove deprecated code.
6e48702 is described below

commit 6e48702e1999c4a5240a5285a44998132e7f83f6
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 14:21:13 2020 -0400

    Remove deprecated code.
---
 .../main/java/org/apache/juneau/BeanContext.java   | 43 ----------------------
 .../java/org/apache/juneau/BeanContextBuilder.java | 42 ---------------------
 .../org/apache/juneau/uon/UonParserBuilder.java    | 14 -------
 .../urlencoding/UrlEncodingParserBuilder.java      | 14 -------
 .../urlencoding/UrlEncodingSerializerBuilder.java  | 14 -------
 .../rest/annotation/RestMethodConfigApply.java     |  2 -
 6 files changed, 129 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 d1a9488..0eaee4d 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
@@ -1854,36 +1854,6 @@ public class BeanContext extends Context implements MetaProvider {
 	public static final String BEAN_notBeanPackages_remove = PREFIX + ".notBeanPackages.ss/remove";
 
 	/**
-	 * Configuration property:  POJO swaps.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #BEAN_swaps}
-	 * </div>
-	 */
-	@Deprecated
-	public static final String BEAN_pojoSwaps = PREFIX + ".pojoSwaps.lo";
-
-	/**
-	 * Configuration property:  Add to POJO swap classes.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #BEAN_swaps_add}
-	 * </div>
-	 */
-	@Deprecated
-	public static final String BEAN_pojoSwaps_add = PREFIX + ".pojoSwaps.lo/add";
-
-	/**
-	 * Configuration property:  Remove from POJO swap classes.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #BEAN_swaps_remove}
-	 * </div>
-	 */
-	@Deprecated
-	public static final String BEAN_pojoSwaps_remove = PREFIX + ".pojoSwaps.lo/remove";
-
-	/**
 	 * Configuration property:  Bean property namer.
 	 *
 	 * <h5 class='section'>Property:</h5>
@@ -2466,19 +2436,6 @@ public class BeanContext extends Context implements MetaProvider {
 		beanFilters = lbf.toArray(new BeanFilter[0]);
 
 		LinkedList<PojoSwap<?,?>> lpf = new LinkedList<>();
-		for (Object o : getListProperty(BEAN_pojoSwaps, Object.class)) {
-			if (o instanceof Class) {
-				ClassInfo ci = ClassInfo.of((Class<?>)o);
-				if (ci.isChildOf(PojoSwap.class))
-					lpf.add(castOrCreate(PojoSwap.class, ci.inner()));
-				else if (ci.isChildOf(Surrogate.class))
-					lpf.addAll(SurrogateSwap.findPojoSwaps(ci.inner(), this));
-				else
-					throw new BasicRuntimeException("Invalid class {0} specified in BeanContext.pojoSwaps
property.  Must be a subclass of PojoSwap or Surrogate.", ci.inner());
-			} else if (o instanceof PojoSwap) {
-				lpf.add((PojoSwap)o);
-			}
-		}
 		for (Object o : getListProperty(BEAN_swaps, Object.class)) {
 			if (o instanceof Class) {
 				ClassInfo ci = ClassInfo.of((Class<?>)o);
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 5331adf..38e7572 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
@@ -2800,48 +2800,6 @@ public class BeanContextBuilder extends ContextBuilder {
 	}
 
 	/**
-	 * <i><l>BeanContext</l> configuration property:&emsp;</i> 
POJO swaps.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #swaps(Object...)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public BeanContextBuilder pojoSwaps(Object...values) {
-		return appendTo(BEAN_pojoSwaps, values);
-	}
-
-	/**
-	 * <i><l>BeanContext</l> configuration property:&emsp;</i> 
POJO swaps.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #set(String,Object)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public BeanContextBuilder pojoSwapsReplace(Object...values) {
-		return set(BEAN_pojoSwaps, values);
-	}
-
-	/**
-	 * <i><l>BeanContext</l> configuration property:&emsp;</i> 
POJO swaps.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #removeFrom(String,Object)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public BeanContextBuilder pojoSwapsRemove(Object...values) {
-		return removeFrom(BEAN_pojoSwaps, values);
-	}
-
-	/**
 	 * <i><l>BeanContext</l> configuration property:&emsp;</i> 
Bean property namer
 	 *
 	 * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
index b93456c..3f5e245 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
@@ -98,20 +98,6 @@ public class UonParserBuilder extends ReaderParserBuilder {
 	/**
 	 * <i><l>UonParser</l> configuration property:&emsp;</i>  Validate
end.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #validateEnd()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public UonParserBuilder validateEnd(boolean value) {
-		return set(UON_validateEnd, value);
-	}
-
-	/**
-	 * <i><l>UonParser</l> configuration property:&emsp;</i>  Validate
end.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>validateEnd(<jk>true</jk>)</code>.
 	 *
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
index 7fddcaa..12c90fc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
@@ -59,20 +59,6 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
 	/**
 	 * <i><l>UrlEncodingParser</l> configuration property:&emsp;</i>
 Serialize bean property collections/arrays as separate key/value pairs.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #expandedParams()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public UrlEncodingParserBuilder expandedParams(boolean value) {
-		return set(URLENC_expandedParams, value);
-	}
-
-	/**
-	 * <i><l>UrlEncodingParser</l> configuration property:&emsp;</i>
 Serialize bean property collections/arrays as separate key/value pairs.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>expandedParams(<jk>true</jk>)</code>.
 	 *
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index 113dc63..e9a244a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -59,20 +59,6 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder
{
 	/**
 	 * <i><l>UrlEncodingSerializer</l> configuration property:&emsp;</i>
 Serialize bean property collections/arrays as separate key/value pairs.
 	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #expandedParams()}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@FluentSetter
-	@Deprecated
-	public UrlEncodingSerializerBuilder expandedParams(boolean value) {
-		return set(URLENC_expandedParams, value);
-	}
-
-	/**
-	 * <i><l>UrlEncodingSerializer</l> configuration property:&emsp;</i>
 Serialize bean property collections/arrays as separate key/value pairs.
-	 *
 	 * <p>
 	 * Shortcut for calling <code>expandedParams(<jk>true</jk>)</code>.
 	 *
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
index 9eda5a6..58a00db 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodConfigApply.java
@@ -120,8 +120,6 @@ public class RestMethodConfigApply extends ConfigApply<RestMethod>
{
 
 		psb.set(BEAN_beanFilters, merge(ConverterUtils.toType(psb.peek(BEAN_beanFilters), Object[].class),
a.beanFilters()));
 
-		psb.set(BEAN_pojoSwaps, merge(ConverterUtils.toType(psb.peek(BEAN_pojoSwaps), Object[].class),
a.pojoSwaps()));
-
 		if (a.bpi().length > 0) {
 			Map<String,String> bpiMap = new LinkedHashMap<>();
 			for (String s1 : a.bpi()) {


Mime
View raw message