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:04:08 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 b2953a8  Remove deprecated code.
b2953a8 is described below

commit b2953a87b46557a0fb9f18da1340f46bd061511c
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 17:04:04 2020 -0400

    Remove deprecated code.
---
 .../apache/juneau/rest/HttpRuntimeException.java   |   5 +-
 .../java/org/apache/juneau/rest/RestContext.java   |  10 +-
 .../org/apache/juneau/rest/RestContextBuilder.java |  26 ---
 .../java/org/apache/juneau/rest/RestException.java | 205 ---------------------
 .../apache/juneau/rest/RestMethodProperties.java   |  57 ------
 .../apache/juneau/rest/exception/BadRequest.java   |  89 ---------
 .../org/apache/juneau/rest/exception/Conflict.java |  89 ---------
 .../juneau/rest/exception/ExpectationFailed.java   |  89 ---------
 .../juneau/rest/exception/FailedDependency.java    |  89 ---------
 .../apache/juneau/rest/exception/Forbidden.java    |  90 ---------
 .../org/apache/juneau/rest/exception/Gone.java     |  93 ----------
 .../rest/exception/HttpVersionNotSupported.java    |  89 ---------
 .../juneau/rest/exception/InsufficientStorage.java |  89 ---------
 .../juneau/rest/exception/InternalServerError.java |  89 ---------
 .../juneau/rest/exception/LengthRequired.java      |  89 ---------
 .../org/apache/juneau/rest/exception/Locked.java   |  89 ---------
 .../apache/juneau/rest/exception/LoopDetected.java |  89 ---------
 .../juneau/rest/exception/MethodNotAllowed.java    |  89 ---------
 .../juneau/rest/exception/MisdirectedRequest.java  |  89 ---------
 .../exception/NetworkAuthenticationRequired.java   |  90 ---------
 .../juneau/rest/exception/NotAcceptable.java       |  89 ---------
 .../apache/juneau/rest/exception/NotExtended.java  |  89 ---------
 .../org/apache/juneau/rest/exception/NotFound.java |  90 ---------
 .../juneau/rest/exception/NotImplemented.java      |  90 ---------
 .../juneau/rest/exception/PayloadTooLarge.java     |  89 ---------
 .../juneau/rest/exception/PreconditionFailed.java  |  89 ---------
 .../rest/exception/PreconditionRequired.java       |  90 ---------
 .../juneau/rest/exception/RangeNotSatisfiable.java |  90 ---------
 .../exception/RequestHeaderFieldsTooLarge.java     |  89 ---------
 .../juneau/rest/exception/ServiceUnavailable.java  |  90 ---------
 .../juneau/rest/exception/TooManyRequests.java     |  90 ---------
 .../apache/juneau/rest/exception/Unauthorized.java |  92 ---------
 .../rest/exception/UnavailableForLegalReasons.java |  89 ---------
 .../juneau/rest/exception/UnprocessableEntity.java |  89 ---------
 .../rest/exception/UnsupportedMediaType.java       |  90 ---------
 .../juneau/rest/exception/UpgradeRequired.java     |  89 ---------
 .../apache/juneau/rest/exception/UriTooLong.java   |  90 ---------
 .../rest/exception/VariantAlsoNegotiates.java      |  89 ---------
 .../apache/juneau/rest/exception/package-info.java |  18 --
 39 files changed, 5 insertions(+), 3270 deletions(-)

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HttpRuntimeException.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HttpRuntimeException.java
index d5cdbfd..0e6b1d8 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HttpRuntimeException.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HttpRuntimeException.java
@@ -68,12 +68,11 @@ public final class HttpRuntimeException extends BasicRuntimeException {
 	 * @param args The message arguments to pass to the ec class constructor.
 	 * @return RuntimeException The new exception to throw.
 	 */
-	@SuppressWarnings("deprecation")
 	public static RuntimeException toHttpException(Throwable t, Class<?> ec, String msg, Object...args) {
 		ClassInfo ci = ClassInfo.ofc(t);
 
-		// If it's a RestException or is any RuntimeException annotated with @Response, it can be rethrown.
-		if (ci.isRuntimeException() && (ci.isChildOf(RestException.class) || ci.hasAnnotation(Response.class)))
+		// If it's any RuntimeException annotated with @Response, it can be rethrown.
+		if (ci.isRuntimeException() && ci.hasAnnotation(Response.class))
 			return (RuntimeException)t;
 
 		// If it's a non-RuntimeException but annotated with @Response, it can be wrapped and rethrown.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index ab69106..dd4b08b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -3901,7 +3901,7 @@ public class RestContext extends BeanContext {
 							final ClassMeta<?> interfaceClass = getClassMeta(mi.inner().getGenericReturnType());
 							final RrpcInterfaceMeta rim = new RrpcInterfaceMeta(interfaceClass.getInnerClass(), null);
 							if (rim.getMethodsByPath().isEmpty())
-								throw new RestException(SC_INTERNAL_SERVER_ERROR, "Method {0} returns an interface {1} that doesn't define any remote methods.", mi.getSignature(), interfaceClass.getFullName());
+								throw new InternalServerError("Method {0} returns an interface {1} that doesn't define any remote methods.", mi.getSignature(), interfaceClass.getFullName());
 
 							RestMethodContextBuilder smb = new RestMethodContextBuilder(resource, mi.inner(), this);
 							smb.dotAll();
@@ -5300,7 +5300,6 @@ public class RestContext extends BeanContext {
 	 * @param t The thrown object.
 	 * @return The converted thrown object.
 	 */
-	@SuppressWarnings("deprecation")
 	public Throwable convertThrowable(Throwable t) {
 
 		ClassInfo ci = ClassInfo.ofc(t);
@@ -5314,7 +5313,7 @@ public class RestContext extends BeanContext {
 			ci = ClassInfo.ofc(t);
 		}
 
-		if (ci.isChildOf(RestException.class) || ci.hasAnnotation(Response.class))
+		if (ci.hasAnnotation(Response.class))
 			return t;
 
 		if (t instanceof ParseException || t instanceof InvalidDataConversionException)
@@ -5366,7 +5365,6 @@ public class RestContext extends BeanContext {
 	 * @param e The exception that occurred.
 	 * @throws IOException Can be thrown if a problem occurred trying to write to the output stream.
 	 */
-	@SuppressWarnings("deprecation")
 	public synchronized void handleError(RestCall call, Throwable e) throws IOException {
 
 		call.exception(e);
@@ -5374,8 +5372,6 @@ public class RestContext extends BeanContext {
 		if (call.isDebug())
 			e.printStackTrace();
 
-		int occurrence = getStackTraceOccurrence(e);
-
 		int code = 500;
 
 		ClassInfo ci = ClassInfo.ofc(e);
@@ -5384,7 +5380,7 @@ public class RestContext extends BeanContext {
 			if (r.code().length > 0)
 				code = r.code()[0];
 
-		RestException e2 = (e instanceof RestException ? (RestException)e : new RestException(e, code)).setOccurrence(occurrence);
+		HttpException e2 = (e instanceof HttpException ? (HttpException)e : new HttpException(e, code));
 
 		HttpServletRequest req = call.getRequest();
 		HttpServletResponse res = call.getResponse();
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 1417acf..4a7ab31 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
@@ -2406,32 +2406,6 @@ public class RestContextBuilder extends BeanContextBuilder implements ServletCon
 	}
 
 	/**
-	 * <i><l>RestContext</l> configuration property:&emsp;</i>  Use stack trace hashes.
-	 *
-	 * <div class='warn'>
-	 * 	<b>Deprecated</b> - Use {@link #callLoggerConfig(RestCallLoggerConfig)}
-	 * </div>
-	 *
-	 * <p>
-	 * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,
-	 * made available through the {@link RestException#getOccurrence()} method.
-	 *
-	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RestContext#REST_useStackTraceHashes}
-	 * </ul>
-	 *
-	 * @param value
-	 * 	The new value for this setting.
-	 * 	<br>The default is <jk>true</jk>.
-	 * @return This object (for method chaining).
-	 */
-	@Deprecated
-	@FluentSetter
-	public RestContextBuilder useStackTraceHashes(boolean value) {
-		return set(REST_useStackTraceHashes, value);
-	}
-
-	/**
 	 * <i><l>RestContext</l> configuration property:&emsp;</i>  HTML Widgets.
 	 *
 	 * <div class='warn'>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
deleted file mode 100644
index d126e8c..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
+++ /dev/null
@@ -1,205 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest;
-
-import static org.apache.juneau.internal.StringUtils.*;
-
-import java.lang.reflect.*;
-import java.text.*;
-
-import org.apache.juneau.http.exception.*;
-
-/**
- * Exception thrown to trigger an error HTTP status.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link HttpException}
- * </div>
- *
- * <p>
- * REST methods on subclasses of {@link RestServlet} can throw this exception to trigger an HTTP status other than the
- * automatically-generated <c>404</c>, <c>405</c>, and <c>500</c> statuses.
- */
-@Deprecated
-public class RestException extends RuntimeException {
-
-	private static final long serialVersionUID = 1L;
-
-	private int status;
-	@Deprecated private int occurrence;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause of this exception.
-	 * @param status The HTTP status code.
-	 * @param msg The status message.
-	 * @param args Optional {@link MessageFormat}-style arguments.
-	 */
-	public RestException(Throwable cause, int status, String msg, Object...args) {
-		super(message(cause, msg, args), cause);
-		this.status = status;
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The status message.
-	 */
-	public RestException(String msg) {
-		super(msg, null);
-	}
-
-	private static String message(Throwable cause, String msg, Object...args) {
-		if (msg == null && cause != null)
-			return firstNonEmpty(cause.getLocalizedMessage(), cause.getClass().getName());
-		return format(msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 * @param cause The root exception.
-	 * @param status The HTTP status code.
-	 */
-	public RestException(Throwable cause, int status) {
-		this(cause, status, null);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param status The HTTP status code.
-	 * @param msg The status message.
-	 * @param args Optional {@link MessageFormat}-style arguments.
-	 */
-	public RestException(int status, String msg, Object...args) {
-		this(null, status, msg, args);
-	}
-
-	/**
-	 * Returns the root cause of this exception.
-	 *
-	 * <p>
-	 * The root cause is the first exception in the init-cause parent chain that's not one of the following:
-	 * <ul>
-	 * 	<li>{@link RestException}
-	 * 	<li>{@link InvocationTargetException}
-	 * </ul>
-	 *
-	 * @return The root cause of this exception, or <jk>null</jk> if no root cause was found.
-	 */
-	public Throwable getRootCause() {
-		Throwable t = this;
-		while(t != null) {
-			t = t.getCause();
-			if (! (t instanceof RestException || t instanceof InvocationTargetException))
-				return t;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns all error messages from all errors in this stack.
-	 *
-	 * <p>
-	 * Typically useful if you want to render all the error messages in the stack, but don't want to render all the
-	 * stack traces too.
-	 *
-	 * @param scrubForXssVulnerabilities
-	 * 	If <jk>true</jk>, replaces <js>'&lt;'</js>, <js>'&gt;'</js>, and <js>'&amp;'</js> characters with spaces.
-	 * @return All error messages from all errors in this stack.
-	 */
-	public String getFullStackMessage(boolean scrubForXssVulnerabilities) {
-		String msg = getMessage();
-		StringBuilder sb = new StringBuilder();
-		if (msg != null) {
-			if (scrubForXssVulnerabilities)
-				msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');
-			sb.append(msg);
-		}
-		Throwable e = getCause();
-		while (e != null) {
-			msg = e.getMessage();
-			if (msg != null && scrubForXssVulnerabilities)
-				msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');
-			String cls = e.getClass().getSimpleName();
-			if (msg == null)
-				sb.append(format("\nCaused by ({0})", cls));
-			else
-				sb.append(format("\nCaused by ({0}): {1}", cls, msg));
-			e = e.getCause();
-		}
-		return sb.toString();
-	}
-
-	@Override /* Object */
-	public int hashCode() {
-		int i = 0;
-		Throwable t = this;
-		while (t != null) {
-			for (StackTraceElement e : t.getStackTrace())
-			i ^= e.hashCode();
-			t = t.getCause();
-		}
-		return i;
-	}
-
-	/**
-	 * Set the occurrence count on this exception.
-	 *
-	 * @param occurrence The number of times this exception has occurred.
-	 * @return This object (for method chaining).
-	 */
-	@Deprecated
-	protected RestException setOccurrence(int occurrence) {
-		this.occurrence = occurrence;
-		return this;
-	}
-
-	/**
-	 * Set the status code on this exception.
-	 *
-	 * @param status The status code.
-	 * @return This object (for method chaining).
-	 */
-	protected RestException setStatus(int status) {
-		this.status = status;
-		return this;
-	}
-
-	/**
-	 * Returns the number of times this exception occurred on this servlet.
-	 *
-	 * @return
-	 * 	The occurrence number if {@code @RestResource(useStackTraceHashes)} is enabled, or <c>0</c> otherwise.
-	 */
-	@Deprecated
-	public int getOccurrence() {
-		return occurrence;
-	}
-
-	/**
-	 * Returns the HTTP status code.
-	 *
-	 * @return The HTTP status code.
-	 */
-	public int getStatus() {
-		return status;
-	}
-
-	// When serialized, just serialize the message itself.
-	@Override /* Object */
-	public String toString() {
-		return emptyIfNull(getLocalizedMessage());
-	}
-}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java
deleted file mode 100644
index 3f92639..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest;
-
-import org.apache.juneau.collections.*;
-import org.apache.juneau.rest.annotation.*;
-
-/**
- * Encapsulates java-method-level properties.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link RequestAttributes}
- * </div>
- *
- * <p>
- * These are properties specified on a REST resource method that extends the properties defined on {@link RestContextProperties}
- * and adds the following:
- * <ul class='javatree'>
- * 	<li class='ja'>{@link RestMethod#properties()}
- * </ul>
- *
- * <ul class='seealso'>
- * 	<li class='link'>{@doc RestConfigurableProperties}
- * </ul>
- */
-@SuppressWarnings("serial")
-@Deprecated
-public class RestMethodProperties extends OMap {
-
-	/**
-	 * Constructor
-	 *
-	 * @param inner The inner properties.
-	 */
-	public RestMethodProperties(RestContextProperties inner) {
-		inner(inner);
-	}
-
-	/**
-	 * Constructor
-	 *
-	 * @param inner The inner properties.
-	 */
-	public RestMethodProperties(RestMethodProperties inner) {
-		inner(inner);
-	}
-}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/BadRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/BadRequest.java
deleted file mode 100644
index 70ec423..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/BadRequest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.BadRequest.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 400 (Bad Request).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.BadRequest}
- * </div>
- *
- * <p>
- * The server cannot or will not process the request due to an apparent client error (e.g., malformed request syntax, size too large, invalid request message framing, or deceptive request routing).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class BadRequest extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 400;
-
-	/** Default message */
-	public static final String MESSAGE = "Bad Request";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public BadRequest(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public BadRequest(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public BadRequest() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public BadRequest(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public BadRequest(Throwable cause) {
-		this(cause, null);
-	}
-}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Conflict.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Conflict.java
deleted file mode 100644
index b0265f1..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Conflict.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.Conflict.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 409 (Conflict).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.Conflict}
- * </div>
- *
- * <p>
- * Indicates that the request could not be processed because of conflict in the request, such as an edit conflict between multiple simultaneous updates.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Conflict extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 409;
-
-	/** Default message */
-	public static final String MESSAGE = "Conflict";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Conflict(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public Conflict(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public Conflict() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Conflict(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public Conflict(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/ExpectationFailed.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/ExpectationFailed.java
deleted file mode 100644
index 27e3577..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/ExpectationFailed.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.ExpectationFailed.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 417 (Expectation Failed).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.ExpectationFailed}
- * </div>
- *
- * <p>
- * The server cannot meet the requirements of the Expect request-header field.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class ExpectationFailed extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 417;
-
-	/** Default message */
-	public static final String MESSAGE = "Expectation Failed";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public ExpectationFailed(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public ExpectationFailed(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public ExpectationFailed() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public ExpectationFailed(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public ExpectationFailed(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/FailedDependency.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/FailedDependency.java
deleted file mode 100644
index 0ae9dfa..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/FailedDependency.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.FailedDependency.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 424 (Failed Dependency).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.FailedDependency}
- * </div>
- *
- * <p>
- * The request failed because it depended on another request and that request failed (e.g., a PROPPATCH).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class FailedDependency extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 424;
-
-	/** Default message */
-	public static final String MESSAGE = "Failed Dependency";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public FailedDependency(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public FailedDependency(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public FailedDependency() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public FailedDependency(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public FailedDependency(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Forbidden.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Forbidden.java
deleted file mode 100644
index b0d21f0..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Forbidden.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.Forbidden.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 403 (Forbidden).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.Forbidden}
- * </div>
- *
- * <p>
- * The request was valid, but the server is refusing action.
- * <br>The user might not have the necessary permissions for a resource, or may need an account of some sort.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Forbidden extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 403;
-
-	/** Default message */
-	public static final String MESSAGE = "Forbidden";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Forbidden(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public Forbidden(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public Forbidden() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Forbidden(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public Forbidden(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Gone.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Gone.java
deleted file mode 100644
index 80a056a..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Gone.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.Gone.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 410 ().
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.Gone}
- * </div>
- *
- * <p>
- * Indicates that the resource requested is no longer available and will not be available again.
- * <br>This should be used when a resource has been intentionally removed and the resource should be purged.
- * <br>Upon receiving a 410 status code, the client should not request the resource in the future.
- * <br>Clients such as search engines should remove the resource from their indices.
- * <br>Most use cases do not require clients and search engines to purge the resource, and a <js>"404 Not Found"</js> may be used instead.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Gone extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 410;
-
-	/** Default message */
-	public static final String MESSAGE = "Gone";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Gone(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public Gone(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public Gone() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Gone(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public Gone(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/HttpVersionNotSupported.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/HttpVersionNotSupported.java
deleted file mode 100644
index 1d268aa..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/HttpVersionNotSupported.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.HttpVersionNotSupported.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 505 ().
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.HttpVersionNotSupported}
- * </div>
- *
- * <p>
- * The server does not support the HTTP protocol version used in the request.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class HttpVersionNotSupported extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 505;
-
-	/** Default message */
-	public static final String MESSAGE = "HTTP Version Not Supported";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public HttpVersionNotSupported(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public HttpVersionNotSupported(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public HttpVersionNotSupported() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public HttpVersionNotSupported(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public HttpVersionNotSupported(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/InsufficientStorage.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/InsufficientStorage.java
deleted file mode 100644
index e88e93f..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/InsufficientStorage.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.InsufficientStorage.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 507 ().
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.InsufficientStorage}
- * </div>
- *
- * <p>
- * The server is unable to store the representation needed to complete the request.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class InsufficientStorage extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 507;
-
-	/** Default message */
-	public static final String MESSAGE = "Insufficient Storage";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public InsufficientStorage(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public InsufficientStorage(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public InsufficientStorage() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public InsufficientStorage(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public InsufficientStorage(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/InternalServerError.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/InternalServerError.java
deleted file mode 100644
index 6805fae..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/InternalServerError.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.InternalServerError.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 500 (Internal Server Error).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.InternalServerError}
- * </div>
- *
- * <p>
- * A generic error message, given when an unexpected condition was encountered and no more specific message is suitable.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class InternalServerError extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 500;
-
-	/** Default message */
-	public static final String MESSAGE = "Internal Server Error";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public InternalServerError(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public InternalServerError(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public InternalServerError() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public InternalServerError(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public InternalServerError(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/LengthRequired.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/LengthRequired.java
deleted file mode 100644
index 1efa5a6..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/LengthRequired.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.LengthRequired.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 411 ().
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.LengthRequired}
- * </div>
- *
- * <p>
- * The request did not specify the length of its content, which is required by the requested resource.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class LengthRequired extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 411;
-
-	/** Default message */
-	public static final String MESSAGE = "Length Required";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public LengthRequired(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public LengthRequired(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public LengthRequired() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public LengthRequired(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public LengthRequired(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Locked.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Locked.java
deleted file mode 100644
index ecbb1ad..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Locked.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.Locked.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 423 (Locked).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.Locked}
- * </div>
- *
- * <p>
- * The resource that is being accessed is locked.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Locked extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 423;
-
-	/** Default message */
-	public static final String MESSAGE = "Locked";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Locked(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public Locked(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public Locked() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Locked(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public Locked(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/LoopDetected.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/LoopDetected.java
deleted file mode 100644
index b24ca3c..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/LoopDetected.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.LoopDetected.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 508 (Loop Detected).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.LoopDetected}
- * </div>
- *
- * <p>
- * The server detected an infinite loop while processing the request (sent in lieu of 208 Already Reported).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class LoopDetected extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 508;
-
-	/** Default message */
-	public static final String MESSAGE = "Loop Detected";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public LoopDetected(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public LoopDetected(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public LoopDetected() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public LoopDetected(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public LoopDetected(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/MethodNotAllowed.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/MethodNotAllowed.java
deleted file mode 100644
index b7d7bad..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/MethodNotAllowed.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.MethodNotAllowed.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 405 (Method Not Allowed).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.MethodNotAllowed}
- * </div>
- *
- * <p>
- * A request method is not supported for the requested resource; for example, a GET request on a form that requires data to be presented via POST, or a PUT request on a read-only resource.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class MethodNotAllowed extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 405;
-
-	/** Default message */
-	public static final String MESSAGE = "Method Not Allowed";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public MethodNotAllowed(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public MethodNotAllowed(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public MethodNotAllowed() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public MethodNotAllowed(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public MethodNotAllowed(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/MisdirectedRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/MisdirectedRequest.java
deleted file mode 100644
index 3b8d678..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/MisdirectedRequest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.MisdirectedRequest.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 421 (Misdirected Request).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.MisdirectedRequest}
- * </div>
- *
- * <p>
- * The request was directed at a server that is not able to produce a response (for example because of connection reuse).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class MisdirectedRequest extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 421;
-
-	/** Default message */
-	public static final String MESSAGE = "Misdirected Request";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public MisdirectedRequest(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public MisdirectedRequest(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public MisdirectedRequest() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public MisdirectedRequest(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public MisdirectedRequest(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NetworkAuthenticationRequired.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NetworkAuthenticationRequired.java
deleted file mode 100644
index 4923b1e..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NetworkAuthenticationRequired.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.NetworkAuthenticationRequired.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 511 (Network Authentication Required).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.NetworkAuthenticationRequired}
- * </div>
- *
- * <p>
- * The client needs to authenticate to gain network access.
- * <br>Intended for use by intercepting proxies used to control access to the network (e.g., "captive portals" used to require agreement to Terms of Service before granting full Internet access via a Wi-Fi hotspot).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NetworkAuthenticationRequired extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 511;
-
-	/** Default message */
-	public static final String MESSAGE = "Network Authentication Required";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NetworkAuthenticationRequired(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public NetworkAuthenticationRequired(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public NetworkAuthenticationRequired() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NetworkAuthenticationRequired(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public NetworkAuthenticationRequired(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotAcceptable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotAcceptable.java
deleted file mode 100644
index c2501e6..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotAcceptable.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.NotAcceptable.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 406 (Not Acceptable).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.NotAcceptable}
- * </div>
- *
- * <br>
- * The requested resource is capable of generating only content not acceptable according to the Accept headers sent in the request.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NotAcceptable extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 406;
-
-	/** Default message */
-	public static final String MESSAGE = "Not Acceptable";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotAcceptable(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public NotAcceptable(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public NotAcceptable() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotAcceptable(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public NotAcceptable(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotExtended.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotExtended.java
deleted file mode 100644
index d5149d2..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotExtended.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.NotExtended.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 510 (Not Extended).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.NotExtended}
- * </div>
- *
- * <p>
- * Further extensions to the request are required for the server to fulfill it.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NotExtended extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 510;
-
-	/** Default message */
-	public static final String MESSAGE = "Not Extended";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotExtended(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public NotExtended(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public NotExtended() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotExtended(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public NotExtended(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotFound.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotFound.java
deleted file mode 100644
index 22fe4c4..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotFound.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.NotFound.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 404 (Not Found).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.NotFound}
- * </div>
- *
- * <p>
- * The requested resource could not be found but may be available in the future.
- * <br>Subsequent requests by the client are permissible.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NotFound extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 404;
-
-	/** Default message */
-	public static final String MESSAGE = "Not Found";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotFound(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public NotFound(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public NotFound() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotFound(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public NotFound(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotImplemented.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotImplemented.java
deleted file mode 100644
index ed75ef2..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/NotImplemented.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.NotImplemented.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 501 (Not Implemented).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.NotImplemented}
- * </div>
- *
- * <p>
- * The server either does not recognize the request method, or it lacks the ability to fulfill the request.
- * <br>Usually this implies future availability (e.g., a new feature of a web-service API).
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class NotImplemented extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 501;
-
-	/** Default message */
-	public static final String MESSAGE = "Not Implemented";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotImplemented(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public NotImplemented(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public NotImplemented() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public NotImplemented(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public NotImplemented(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PayloadTooLarge.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PayloadTooLarge.java
deleted file mode 100644
index 6b4fe82..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PayloadTooLarge.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.PayloadTooLarge.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 413 (Payload Too Large).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.PayloadTooLarge}
- * </div>
- *
- * <p>
- * The request is larger than the server is willing or able to process.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class PayloadTooLarge extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 413;
-
-	/** Default message */
-	public static final String MESSAGE = "Payload Too Large";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public PayloadTooLarge(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public PayloadTooLarge(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public PayloadTooLarge() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public PayloadTooLarge(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public PayloadTooLarge(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PreconditionFailed.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PreconditionFailed.java
deleted file mode 100644
index 2f8a1ad..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PreconditionFailed.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.PreconditionFailed.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 412 (Precondition Failed).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.PreconditionFailed}
- * </div>
- *
- * <p>
- * The server does not meet one of the preconditions that the requester put on the request.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class PreconditionFailed extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 412;
-
-	/** Default message */
-	public static final String MESSAGE = "Precondition Failed";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public PreconditionFailed(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public PreconditionFailed() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public PreconditionFailed(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public PreconditionFailed(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public PreconditionFailed(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PreconditionRequired.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PreconditionRequired.java
deleted file mode 100644
index f6e7349..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/PreconditionRequired.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.PreconditionRequired.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 428 (Precondition Required).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.PreconditionRequired}
- * </div>
- *
- * <p>
- * The origin server requires the request to be conditional.
- * <br>Intended to prevent the 'lost update' problem, where a client GETs a resource's state, modifies it, and PUTs it back to the server, when meanwhile a third party has modified the state on the server, leading to a conflict.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class PreconditionRequired extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 428;
-
-	/** Default message */
-	public static final String MESSAGE = "Precondition Required";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public PreconditionRequired(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public PreconditionRequired(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public PreconditionRequired() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public PreconditionRequired(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public PreconditionRequired(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/RangeNotSatisfiable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/RangeNotSatisfiable.java
deleted file mode 100644
index 17b3dec..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/RangeNotSatisfiable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.RangeNotSatisfiable.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 416 (Range Not Satisfiable).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.RangeNotSatisfiable}
- * </div>
- *
- * <p>
- * The client has asked for a portion of the file (byte serving), but the server cannot supply that portion.
- * <br>For example, if the client asked for a part of the file that lies beyond the end of the file.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class RangeNotSatisfiable extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 416;
-
-	/** Default message */
-	public static final String MESSAGE = "Range Not Satisfiable";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public RangeNotSatisfiable(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public RangeNotSatisfiable(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public RangeNotSatisfiable() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public RangeNotSatisfiable(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public RangeNotSatisfiable(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/RequestHeaderFieldsTooLarge.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/RequestHeaderFieldsTooLarge.java
deleted file mode 100644
index 420272c..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/RequestHeaderFieldsTooLarge.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.RequestHeaderFieldsTooLarge.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 431 (Request Header Fields Too Large).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.RequestHeaderFieldsTooLarge}
- * </div>
- *
- * <p>
- * The server is unwilling to process the request because either an individual header field, or all the header fields collectively, are too large.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class RequestHeaderFieldsTooLarge extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 431;
-
-	/** Default message */
-	public static final String MESSAGE = "Request Header Fields Too Large";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public RequestHeaderFieldsTooLarge(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public RequestHeaderFieldsTooLarge(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public RequestHeaderFieldsTooLarge() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public RequestHeaderFieldsTooLarge(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public RequestHeaderFieldsTooLarge(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/ServiceUnavailable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/ServiceUnavailable.java
deleted file mode 100644
index c442733..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/ServiceUnavailable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.ServiceUnavailable.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 503 (Service Unavailable).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.ServiceUnavailable}
- * </div>
- *
- * <p>
- * The server is currently unavailable (because it is overloaded or down for maintenance).
- * <br>Generally, this is a temporary state.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class ServiceUnavailable extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 503;
-
-	/** Default message */
-	public static final String MESSAGE = "Service Unavailable";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public ServiceUnavailable(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public ServiceUnavailable(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public ServiceUnavailable() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public ServiceUnavailable(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public ServiceUnavailable(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/TooManyRequests.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/TooManyRequests.java
deleted file mode 100644
index 007fe7f..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/TooManyRequests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.TooManyRequests.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 429 (Too Many Requests).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.TooManyRequests}
- * </div>
- *
- * <p>
- * The user has sent too many requests in a given amount of time.
- * <br>Intended for use with rate-limiting schemes.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class TooManyRequests extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 429;
-
-	/** Default message */
-	public static final String MESSAGE = "Too Many Requests";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public TooManyRequests(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public TooManyRequests(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public TooManyRequests() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public TooManyRequests(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public TooManyRequests(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java
deleted file mode 100644
index 52ebbb4..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java
+++ /dev/null
@@ -1,92 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.Unauthorized.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 401 (Unauthorized).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.Unauthorized}
- * </div>
- *
- * <p>
- * Similar to <c>403 Forbidden</c>, but specifically for use when authentication is required and has failed or has not yet been provided.
- * <br>The response must include a WWW-Authenticate header field containing a challenge applicable to the requested resource.
- * <br>401 semantically means "unauthenticated",i.e. the user does not have the necessary credentials.
- * <br>Note: Some sites issue HTTP 401 when an IP address is banned from the website (usually the website domain) and that specific address is refused permission to access a website.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class Unauthorized extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 401;
-
-	/** Default message */
-	public static final String MESSAGE = "Unauthorized";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Unauthorized(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public Unauthorized(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public Unauthorized() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public Unauthorized(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public Unauthorized(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnavailableForLegalReasons.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnavailableForLegalReasons.java
deleted file mode 100644
index c9dddfb..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnavailableForLegalReasons.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.UnavailableForLegalReasons.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 451 (Unavailable For Legal Reasons).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.UnavailableForLegalReasons}
- * </div>
- *
- * <p>
- * A server operator has received a legal demand to deny access to a resource or to a set of resources that includes the requested resource.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class UnavailableForLegalReasons extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 451;
-
-	/** Default message */
-	public static final String MESSAGE = "Unavailable For Legal Reasons";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UnavailableForLegalReasons(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public UnavailableForLegalReasons(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public UnavailableForLegalReasons() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UnavailableForLegalReasons(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public UnavailableForLegalReasons(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnprocessableEntity.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnprocessableEntity.java
deleted file mode 100644
index 1d7b1be..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnprocessableEntity.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.UnprocessableEntity.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 422 (Unprocessable Entity).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.UnprocessableEntity}
- * </div>
- *
- * <p>
- * The request was well-formed but was unable to be followed due to semantic errors.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class UnprocessableEntity extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 422;
-
-	/** Default message */
-	public static final String MESSAGE = "Unprocessable Entity";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UnprocessableEntity(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public UnprocessableEntity(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public UnprocessableEntity() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UnprocessableEntity(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public UnprocessableEntity(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnsupportedMediaType.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnsupportedMediaType.java
deleted file mode 100644
index 38038b5..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UnsupportedMediaType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.UnsupportedMediaType.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 415 (Unsupported Media Type).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.UnsupportedMediaType}
- * </div>
- *
- * <p>
- * The request entity has a media type which the server or resource does not support.
- * <br>For example, the client uploads an image as image/svg+xml, but the server requires that images use a different format.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class UnsupportedMediaType extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 415;
-
-	/** Default message */
-	public static final String MESSAGE = "Unsupported Media Type";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UnsupportedMediaType(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public UnsupportedMediaType(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public UnsupportedMediaType() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UnsupportedMediaType(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public UnsupportedMediaType(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UpgradeRequired.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UpgradeRequired.java
deleted file mode 100644
index b1c8813..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UpgradeRequired.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.UpgradeRequired.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 426 (Upgrade Required).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.UpgradeRequired}
- * </div>
- *
- * <p>
- * The client should switch to a different protocol such as TLS/1.0, given in the Upgrade header field.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class UpgradeRequired extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 426;
-
-	/** Default message */
-	public static final String MESSAGE = "Upgrade Required";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UpgradeRequired(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public UpgradeRequired(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public UpgradeRequired() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UpgradeRequired(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public UpgradeRequired(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UriTooLong.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UriTooLong.java
deleted file mode 100644
index 99476e9..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/UriTooLong.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.UriTooLong.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 414 (URI Too Long).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.UriTooLong}
- * </div>
- *
- * <p>
- * The URI provided was too long for the server to process.
- * <br>Often the result of too much data being encoded as a query-string of a GET request, in which case it should be converted to a POST request.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class UriTooLong extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 414;
-
-	/** Default message */
-	public static final String MESSAGE = "URI Too Long";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UriTooLong(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public UriTooLong(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public UriTooLong() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public UriTooLong(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public UriTooLong(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/VariantAlsoNegotiates.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/VariantAlsoNegotiates.java
deleted file mode 100644
index 0a9ece2..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/VariantAlsoNegotiates.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.exception;
-
-import static org.apache.juneau.rest.exception.VariantAlsoNegotiates.*;
-
-import java.text.*;
-
-import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.*;
-
-/**
- * Exception representing an HTTP 506 (Variant Also Negotiate).
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link org.apache.juneau.http.exception.VariantAlsoNegotiates}
- * </div>
- *
- * <p>
- * Transparent content negotiation for the request results in a circular reference.
- */
-@Response(code=CODE, description=MESSAGE)
-@Deprecated
-public class VariantAlsoNegotiates extends RestException {
-	private static final long serialVersionUID = 1L;
-
-	/** HTTP status code */
-	public static final int CODE = 506;
-
-	/** Default message */
-	public static final String MESSAGE = "Variant Also Negotiates";
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public VariantAlsoNegotiates(Throwable cause, String msg, Object...args) {
-		super(cause, CODE, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 */
-	public VariantAlsoNegotiates(String msg) {
-		super(msg);
-		setStatus(CODE);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public VariantAlsoNegotiates() {
-		this((Throwable)null, MESSAGE);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param msg The message.  Can be <jk>null</jk>.
-	 * @param args Optional {@link MessageFormat}-style arguments in the message.
-	 */
-	public VariantAlsoNegotiates(String msg, Object...args) {
-		this(null, msg, args);
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param cause The cause.  Can be <jk>null</jk>.
-	 */
-	public VariantAlsoNegotiates(Throwable cause) {
-		this(cause, null);
-	}
-}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/package-info.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/package-info.java
deleted file mode 100644
index b13d243..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
-
-/**
- * HTTP Response Exception Beans
- */
-package org.apache.juneau.rest.exception;
\ No newline at end of file


Mime
View raw message