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 bac681b Remove deprecated code.
bac681b is described below
commit bac681bf83ccda5dfd76643190bcfd9ab38f4a39
Author: JamesBognar <[email protected]>
AuthorDate: Tue Oct 13 17:30:55 2020 -0400
Remove deprecated code.
---
.../org/apache/juneau/rest/annotation/Rest.java | 30 ---------------
.../apache/juneau/rest/annotation/RestMethod.java | 44 ----------------------
.../rest/annotation/RestMethodAnnotation.java | 18 ---------
.../rest/annotation/RestMethodConfigApply.java | 16 --------
4 files changed, 108 deletions(-)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index 46a14fb..e952d4d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -150,16 +150,6 @@ public @interface Rest {
String allowedMethodParams() default "";
/**
- * Default request attributes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #reqAttrs()}
- * </div>
- */
- @Deprecated
- String[] attrs() default {};
-
- /**
* REST children.
*
* <p>
@@ -496,26 +486,6 @@ public @interface Rest {
String defaultContentType() default "";
/**
- * Default request headers.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #reqHeaders()}
- * </div>
- */
- @Deprecated
- String[] defaultRequestHeaders() default {};
-
- /**
- * Default response headers.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #resHeaders()}
- * </div>
- */
- @Deprecated
- String[] defaultResponseHeaders() default {};
-
- /**
* Optional servlet description.
*
* <p>
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index d3cfe80..406411d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -38,16 +38,6 @@ import org.apache.juneau.http.remote.*;
public @interface RestMethod {
/**
- * Default request attributes.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #reqAttrs()}
- * </div>
- */
- @Deprecated
- String[] attrs() default {};
-
- /**
* Sets the bean filters for the serializers and parsers defined on
this method.
*
* <div class='warn'>
@@ -291,16 +281,6 @@ public @interface RestMethod {
String[] defaultQuery() default {};
/**
- * Default request headers.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link #reqHeaders()}
- * </div>
- */
- @Deprecated
- String[] defaultRequestHeaders() default {};
-
- /**
* Optional description for the exposed API.
*
* <p>
@@ -592,30 +572,6 @@ public @interface RestMethod {
String[] paths() default {};
/**
- * Sets the POJO swaps for the serializers and parsers defined on this
method.
- *
- * <div class='warn'>
- * <b>Deprecated</b> - Use {@link BeanConfig#swaps()}
- * </div>
- *
- * <p>
- * If no value is specified, the POJO swaps are inherited from the
class.
- * <br>Otherwise, this value overrides the POJO swaps defined on the
class.
- *
- * <p>
- * Use {@link Inherit} to inherit POJO swaps defined on the class.
- *
- * <p>
- * Use {@link None} to suppress inheriting POJO swaps defined on the
class.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_swaps}
- * </ul>
- */
- @Deprecated
- Class<?>[] pojoSwaps() default {};
-
- /**
* URL path pattern priority.
*
* <p>
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
index 1bab2b9..ba2cea9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
@@ -42,12 +42,10 @@ public class RestMethodAnnotation implements RestMethod {
summary = "";
private String[]
- attrs = new String[0],
bpi = new String[0],
bpx = new String[0],
defaultFormData = new String[0],
defaultQuery = new String[0],
- defaultRequestHeaders = new String[0],
description = new String[0],
flags = new String[0],
paths = new String[0],
@@ -60,7 +58,6 @@ public class RestMethodAnnotation implements RestMethod {
beanFilters = new Class<?>[0],
encoders = new Class<?>[0],
parsers = new Class<?>[0],
- pojoSwaps = new Class<?>[0],
serializers = new Class<?>[0];
private Class<? extends RestConverter>[] converters = new Class[0];
@@ -83,11 +80,6 @@ public class RestMethodAnnotation implements RestMethod {
}
@Override /* RestMethod */
- public String[] attrs() {
- return attrs;
- }
-
- @Override /* RestMethod */
public Class<?>[] beanFilters() {
return beanFilters;
}
@@ -143,11 +135,6 @@ public class RestMethodAnnotation implements RestMethod {
}
@Override /* RestMethod */
- public String[] defaultRequestHeaders() {
- return defaultRequestHeaders;
- }
-
- @Override /* RestMethod */
public String[] description() {
return description;
}
@@ -208,11 +195,6 @@ public class RestMethodAnnotation implements RestMethod {
}
@Override /* RestMethod */
- public Class<?>[] pojoSwaps() {
- return pojoSwaps;
- }
-
- @Override /* RestMethod */
public int priority() {
return priority;
}
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 3e9320e..96287a9 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
@@ -157,14 +157,6 @@ public class RestMethodConfigApply extends
ConfigApply<RestMethod> {
if (! a.roleGuard().isEmpty())
psb.addTo(REST_roleGuard, string(a.roleGuard()));
- for (String h : a.defaultRequestHeaders()) {
- String[] h2 = RestUtils.parseKeyValuePair(string(h));
- if (h2 == null)
- throw new ConfigException(
- "Invalid default request header
specified on method ''{0}'': ''{1}''. Must be in the format:
''name[:=]value''", sig, s);
- psb.putTo(RESTMETHOD_defaultRequestHeaders, h2[0],
h2[1]);
- }
-
for (String h : a.reqHeaders()) {
String[] h2 = RestUtils.parseKeyValuePair(string(h));
if (h2 == null)
@@ -173,14 +165,6 @@ public class RestMethodConfigApply extends
ConfigApply<RestMethod> {
psb.putTo(RESTMETHOD_reqHeaders, h2[0], h2[1]);
}
- for (String ra : a.attrs()) {
- String[] ra2 = RestUtils.parseKeyValuePair(string(ra));
- if (ra2 == null)
- throw new ConfigException(
- "Invalid default request attribute
specified on method ''{0}'': ''{1}''. Must be in the format:
''name[:=]value''", sig, s);
- psb.putTo(RESTMETHOD_attrs, ra2[0], ra2[1]);
- }
-
for (String ra : a.reqAttrs()) {
String[] ra2 = RestUtils.parseKeyValuePair(string(ra));
if (ra2 == null)
