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 21:35:02 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 22a5923  Remove deprecated code.
22a5923 is described below

commit 22a5923fb6f627d91216dc0a652894f4c72c2b73
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 17:34:58 2020 -0400

    Remove deprecated code.
---
 .../org/apache/juneau/rest/RestContextBuilder.java | 84 ----------------------
 .../org/apache/juneau/rest/RestMethodContext.java  | 55 --------------
 2 files changed, 139 deletions(-)

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index c007a9a..3229149 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -878,34 +878,6 @@ public class RestContextBuilder extends BeanContextBuilder implements
ServletCon
 	}
 
 	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Default request attributes.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #reqAttrs(String...)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder attrs(String...values) throws RestServletException {
-		return reqAttrs(values);
-	}
-
-	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Default request headers.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #reqHeaders(String...)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder defaultRequestHeaders(String...headers) throws RestServletException
{
-		return reqHeaders(headers);
-	}
-
-	/**
 	 * Specifies a default <c>Accept</c> header value if not specified on a request.
 	 *
 	 * @param value
@@ -936,62 +908,6 @@ public class RestContextBuilder extends BeanContextBuilder implements
ServletCon
 	}
 
 	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Default request attribute.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #reqAttr(String, Object)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder attr(String name, Object value) {
-		return reqAttr(name, value);
-	}
-
-	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Default request headers.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #reqHeader(String,Object)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder defaultRequestHeader(String name, Object value) {
-		return reqHeader(name, value);
-	}
-
-	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Default response headers.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #resHeaders(String...)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder defaultResponseHeaders(String...headers) throws RestServletException
{
-		return resHeaders(headers);
-	}
-
-	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Default response headers.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #resHeader(String, Object)}
-	 * </div>
-	 */
-	@SuppressWarnings("javadoc")
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder defaultResponseHeader(String name, Object value) {
-		return resHeader(name, value);
-	}
-
-	/**
 	 * <i><l>RestContext</l> configuration property:&emsp;</i> 
Compression encoders.
 	 *
 	 * <p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
index da7881e..5d69d5c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
@@ -68,16 +68,6 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
 	static final String PREFIX = "RestMethodContext";
 
 	/**
-	 * Configuration property:  Default request attributes.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #RESTMETHOD_reqAttrs}
-	 * </div>
-	 */
-	@Deprecated
-	public static final String RESTMETHOD_attrs = PREFIX + ".reqAttrs.smo";
-
-	/**
 	 * Configuration property:  Client version pattern matcher.
 	 *
 	 * <h5 class='section'>Property:</h5>
@@ -257,16 +247,6 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
 	public static final String RESTMETHOD_defaultQuery = PREFIX + ".defaultQuery.omo";
 
 	/**
-	 * Configuration property:  Default request headers.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #RESTMETHOD_defaultRequestHeaders}
-	 * </div>
-	 */
-	@Deprecated
-	public static final String RESTMETHOD_defaultRequestHeaders = PREFIX + ".reqHeaders.smo";
-
-	/**
 	 * Configuration property:  HTTP method name.
 	 *
 	 * <h5 class='section'>Property:</h5>
@@ -401,41 +381,6 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
 	public static final String RESTMETHOD_matchers = PREFIX + ".matchers.lo";
 
 	/**
-	 * Configuration property:  Resource method path.
-	 *
-	 * <h5 class='section'>Property:</h5>
-	 * <ul class='spaced-list'>
-	 * 	<li><b>ID:</b>  {@link org.apache.juneau.rest.RestMethodContext#RESTMETHOD_path
RESTMETHOD_path}
-	 * 	<li><b>Name:</b>  <js>"RestMethodContext.path.s"</js>
-	 * 	<li><b>Data type:</b>  <c>String</c>
-	 * 	<li><b>System property:</b>  <c>RestMethodContext.path</c>
-	 * 	<li><b>Environment variable:</b>  <c>RESTMETHODCONTEXT_PATH</c>
-	 * 	<li><b>Default:</b>  <jk>null</jk>
-	 * 	<li><b>Session property:</b>  <jk>false</jk>
-	 * 	<li><b>Annotations:</b>
-	 * 		<ul>
-	 * 			<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#path()}
-	 * 		</ul>
-	 * </ul>
-	 *
-	 * <h5 class='section'>Description:</h5>
-	 * <p>
-	 * Identifies the URL subpath relative to the servlet class.
-	 *
-	 * <p>
-	 * <ul class='notes'>
-	 * 	<li>
-	 * 		This method is only applicable for Java methods.
-	 * 	<li>
-	 * 		Slashes are trimmed from the path ends.
-	 * 		<br>As a convention, you may want to start your path with <js>'/'</js>
simple because it make it easier to read.
-	 * </ul>
-	 * @deprecated Use {@link #RESTMETHOD_paths}
-	 */
-	@Deprecated
-	public static final String RESTMETHOD_path = PREFIX + ".path.s";
-
-	/**
 	 * Configuration property:  Resource method paths.
 	 *
 	 * <h5 class='section'>Property:</h5>


Mime
View raw message