Servlet deprecation

This commit is contained in:
Harald Kuhr 2021-09-21 14:22:16 +02:00
parent 1c59057c30
commit 0327f5fc1a
63 changed files with 324 additions and 176 deletions

View File

@ -30,14 +30,6 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.lang.StringUtil;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -45,12 +37,22 @@ import java.util.Properties;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException; import java.util.regex.PatternSyntaxException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import com.twelvemonkeys.lang.StringUtil;
/** /**
* BrowserHelperFilter * BrowserHelperFilter
* *
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: BrowserHelperFilter.java#1 $ * @version $Id: BrowserHelperFilter.java#1 $
*/ */
@Deprecated
public class BrowserHelperFilter extends GenericFilter { public class BrowserHelperFilter extends GenericFilter {
private static final String HTTP_HEADER_ACCEPT = "Accept"; private static final String HTTP_HEADER_ACCEPT = "Accept";
protected static final String HTTP_HEADER_USER_AGENT = "User-Agent"; protected static final String HTTP_HEADER_USER_AGENT = "User-Agent";

View File

@ -30,14 +30,15 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import java.io.IOException;
import java.util.Enumeration;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Enumeration;
/** /**
* DebugServlet class description. * DebugServlet class description.
@ -46,6 +47,7 @@ import java.util.Enumeration;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: DebugServlet.java#1 $ * @version $Id: DebugServlet.java#1 $
*/ */
@Deprecated
public class DebugServlet extends GenericServlet { public class DebugServlet extends GenericServlet {
private long dateModified; private long dateModified;

View File

@ -30,14 +30,21 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.lang.BeanUtil;
import javax.servlet.*;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Enumeration; import java.util.Enumeration;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import com.twelvemonkeys.lang.BeanUtil;
/** /**
* Defines a generic, protocol-independent filter. * Defines a generic, protocol-independent filter.
* <p> * <p>
@ -72,6 +79,7 @@ import java.util.Enumeration;
* @see Filter * @see Filter
* @see FilterConfig * @see FilterConfig
*/ */
@Deprecated
public abstract class GenericFilter implements Filter, FilterConfig, Serializable { public abstract class GenericFilter implements Filter, FilterConfig, Serializable {
// TODO: Rewrite to use ServletConfigurator instead of BeanUtil // TODO: Rewrite to use ServletConfigurator instead of BeanUtil

View File

@ -30,11 +30,12 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.lang.BeanUtil; import java.lang.reflect.InvocationTargetException;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import java.lang.reflect.InvocationTargetException;
import com.twelvemonkeys.lang.BeanUtil;
/** /**
* Defines a generic, protocol-independent servlet. * Defines a generic, protocol-independent servlet.
@ -52,6 +53,7 @@ import java.lang.reflect.InvocationTargetException;
* *
* @version $Id: GenericServlet.java#1 $ * @version $Id: GenericServlet.java#1 $
*/ */
@Deprecated
public abstract class GenericServlet extends javax.servlet.GenericServlet { public abstract class GenericServlet extends javax.servlet.GenericServlet {
// TODO: Rewrite to use ServletConfigurator instead of BeanUtil // TODO: Rewrite to use ServletConfigurator instead of BeanUtil

View File

@ -30,11 +30,12 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.lang.BeanUtil; import java.lang.reflect.InvocationTargetException;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import java.lang.reflect.InvocationTargetException;
import com.twelvemonkeys.lang.BeanUtil;
/** /**
* Defines a generic, HTTP specific servlet. * Defines a generic, HTTP specific servlet.
@ -52,6 +53,7 @@ import java.lang.reflect.InvocationTargetException;
* *
* @version $Id: HttpServlet.java#1 $ * @version $Id: HttpServlet.java#1 $
*/ */
@Deprecated
public abstract class HttpServlet extends javax.servlet.http.HttpServlet { public abstract class HttpServlet extends javax.servlet.http.HttpServlet {
// TODO: Rewrite to use ServletConfigurator instead of BeanUtil // TODO: Rewrite to use ServletConfigurator instead of BeanUtil

View File

@ -30,7 +30,12 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import java.lang.annotation.*; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* Annotation to be used by servlets/filters, to have their {@code init}-method * Annotation to be used by servlets/filters, to have their {@code init}-method
@ -49,6 +54,7 @@ import java.lang.annotation.*;
@Inherited @Inherited
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD/*, TODO: ElementType.FIELD*/}) @Target({ElementType.METHOD/*, TODO: ElementType.FIELD*/})
@Deprecated
public @interface InitParam { public @interface InitParam {
static final String UNDEFINED = ""; static final String UNDEFINED = "";
String name() default UNDEFINED; String name() default UNDEFINED;

View File

@ -30,12 +30,13 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.lang.Validate;
import javax.servlet.ServletOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.servlet.ServletOutputStream;
import com.twelvemonkeys.lang.Validate;
/** /**
* A {@code ServletOutputStream} implementation backed by a * A {@code ServletOutputStream} implementation backed by a
* {@link java.io.OutputStream}. For filters that need to buffer the * {@link java.io.OutputStream}. For filters that need to buffer the
@ -71,6 +72,7 @@ import java.io.OutputStream;
* @version $Id: OutputStreamAdapter.java#1 $ * @version $Id: OutputStreamAdapter.java#1 $
* *
*/ */
@Deprecated
public class OutputStreamAdapter extends ServletOutputStream { public class OutputStreamAdapter extends ServletOutputStream {
/** The wrapped {@code OutputStream}. */ /** The wrapped {@code OutputStream}. */

View File

@ -38,6 +38,7 @@ import javax.servlet.ServletException;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: ServletConfigException.java#2 $ * @version $Id: ServletConfigException.java#2 $
*/ */
@Deprecated
public class ServletConfigException extends ServletException { public class ServletConfigException extends ServletException {
// TODO: Parameters for init-param at fault, and possibly servlet name? // TODO: Parameters for init-param at fault, and possibly servlet name?

View File

@ -30,14 +30,15 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import javax.servlet.ServletOutputStream; import static com.twelvemonkeys.lang.Validate.notNull;
import javax.servlet.ServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import static com.twelvemonkeys.lang.Validate.notNull; import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
/** /**
* A delegate for handling stream support in wrapped servlet responses. * A delegate for handling stream support in wrapped servlet responses.
@ -50,6 +51,7 @@ import static com.twelvemonkeys.lang.Validate.notNull;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ServletResponseStreamDelegate.java#2 $ * @version $Id: ServletResponseStreamDelegate.java#2 $
*/ */
@Deprecated
public class ServletResponseStreamDelegate { public class ServletResponseStreamDelegate {
private Object out = null; private Object out = null;
protected final ServletResponse response; protected final ServletResponse response;

View File

@ -30,14 +30,6 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.util.convert.ConversionException;
import com.twelvemonkeys.util.convert.Converter;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.File; import java.io.File;
import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -48,6 +40,21 @@ import java.net.URL;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.FilterConfig;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletRequestWrapper;
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.util.convert.ConversionException;
import com.twelvemonkeys.util.convert.Converter;
/** /**
* Various servlet related helper methods. * Various servlet related helper methods.
@ -57,6 +64,7 @@ import java.util.Map;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ServletUtil.java#3 $ * @version $Id: ServletUtil.java#3 $
*/ */
@Deprecated
public final class ServletUtil { public final class ServletUtil {
/** /**

View File

@ -30,8 +30,12 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import com.twelvemonkeys.io.FileUtil; import java.io.IOException;
import com.twelvemonkeys.lang.StringUtil; import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -39,12 +43,9 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream; import com.twelvemonkeys.io.FileUtil;
import java.util.ArrayList; import com.twelvemonkeys.lang.StringUtil;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* ThrottleFilter, a filter for easing server during heavy load. * ThrottleFilter, a filter for easing server during heavy load.
@ -62,6 +63,7 @@ import java.util.Map;
* @see #setMaxConcurrentThreadCount * @see #setMaxConcurrentThreadCount
* @see #setResponseMessages * @see #setResponseMessages
*/ */
@Deprecated
public class ThrottleFilter extends GenericFilter { public class ThrottleFilter extends GenericFilter {
/** /**

View File

@ -30,12 +30,13 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import java.io.IOException;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
/** /**
* TimingFilter class description. * TimingFilter class description.
@ -44,6 +45,7 @@ import java.io.IOException;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: TimingFilter.java#1 $ * @version $Id: TimingFilter.java#1 $
*/ */
@Deprecated
public class TimingFilter extends GenericFilter { public class TimingFilter extends GenericFilter {
private String attribUsage = null; private String attribUsage = null;

View File

@ -30,12 +30,18 @@
package com.twelvemonkeys.servlet; package com.twelvemonkeys.servlet;
import javax.servlet.*;
import java.io.FilterOutputStream; import java.io.FilterOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
/** /**
* Removes extra unneccessary white space from a servlet response. * Removes extra unneccessary white space from a servlet response.
* White space is defined as per {@link Character#isWhitespace(char)}. * White space is defined as per {@link Character#isWhitespace(char)}.
@ -112,6 +118,7 @@ import java.io.PrintWriter;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: TrimWhiteSpaceFilter.java#2 $ * @version $Id: TrimWhiteSpaceFilter.java#2 $
*/ */
@Deprecated
public class TrimWhiteSpaceFilter extends GenericFilter { public class TrimWhiteSpaceFilter extends GenericFilter {
private boolean autoFlush = true; private boolean autoFlush = true;

View File

@ -30,10 +30,10 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.lang.Validate;
import java.net.URI; import java.net.URI;
import com.twelvemonkeys.lang.Validate;
/** /**
* AbstractCacheRequest * AbstractCacheRequest
* *
@ -41,6 +41,7 @@ import java.net.URI;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: AbstractCacheRequest.java#1 $ * @version $Id: AbstractCacheRequest.java#1 $
*/ */
@Deprecated
public abstract class AbstractCacheRequest implements CacheRequest { public abstract class AbstractCacheRequest implements CacheRequest {
private final URI requestURI; private final URI requestURI;
private final String method; private final String method;

View File

@ -30,7 +30,11 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* AbstractCacheResponse * AbstractCacheResponse
@ -39,6 +43,7 @@ import java.util.*;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: AbstractCacheResponse.java#1 $ * @version $Id: AbstractCacheResponse.java#1 $
*/ */
@Deprecated
public abstract class AbstractCacheResponse implements CacheResponse { public abstract class AbstractCacheResponse implements CacheResponse {
private int status; private int status;
private final Map<String, List<String>> headers = new LinkedHashMap<String, List<String>>(); // Insertion order private final Map<String, List<String>> headers = new LinkedHashMap<String, List<String>>(); // Insertion order

View File

@ -37,6 +37,7 @@ package com.twelvemonkeys.servlet.cache;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: CacheException.java#1 $ * @version $Id: CacheException.java#1 $
*/ */
@Deprecated
public class CacheException extends Exception { public class CacheException extends Exception {
public CacheException(Throwable pCause) { public CacheException(Throwable pCause) {
super(pCause); super(pCause);

View File

@ -30,19 +30,25 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.GenericFilter;
import com.twelvemonkeys.servlet.ServletConfigException;
import com.twelvemonkeys.servlet.ServletUtil;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.GenericFilter;
import com.twelvemonkeys.servlet.ServletConfigException;
import com.twelvemonkeys.servlet.ServletUtil;
/** /**
* A Filter that provides response caching, for HTTP {@code GET} requests. * A Filter that provides response caching, for HTTP {@code GET} requests.
* <p> * <p>
@ -58,6 +64,7 @@ import java.util.logging.Logger;
* @version $Id: CacheFilter.java#4 $ * @version $Id: CacheFilter.java#4 $
* *
*/ */
@Deprecated
public class CacheFilter extends GenericFilter { public class CacheFilter extends GenericFilter {
HTTPCache cache; HTTPCache cache;

View File

@ -41,6 +41,7 @@ import java.util.Map;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: CacheRequest.java#1 $ * @version $Id: CacheRequest.java#1 $
*/ */
@Deprecated
public interface CacheRequest { public interface CacheRequest {
URI getRequestURI(); URI getRequestURI();

View File

@ -42,6 +42,7 @@ import java.util.Map;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: CacheResponse.java#1 $ * @version $Id: CacheResponse.java#1 $
*/ */
@Deprecated
public interface CacheResponse { public interface CacheResponse {
OutputStream getOutputStream() throws IOException; OutputStream getOutputStream() throws IOException;

View File

@ -30,16 +30,17 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.net.HTTPUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponseWrapper;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponseWrapper;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.net.HTTPUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
/** /**
* CacheResponseWrapper class description. * CacheResponseWrapper class description.
* <p> * <p>
@ -54,6 +55,7 @@ import java.io.PrintWriter;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: CacheResponseWrapper.java#3 $ * @version $Id: CacheResponseWrapper.java#3 $
*/ */
@Deprecated
class CacheResponseWrapper extends HttpServletResponseWrapper { class CacheResponseWrapper extends HttpServletResponseWrapper {
private ServletResponseStreamDelegate streamDelegate; private ServletResponseStreamDelegate streamDelegate;

View File

@ -38,6 +38,7 @@ import java.io.IOException;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: CachedEntity.java#3 $ * @version $Id: CachedEntity.java#3 $
*/ */
@Deprecated
interface CachedEntity { interface CachedEntity {
/** /**

View File

@ -30,18 +30,20 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.lang.Validate;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.twelvemonkeys.lang.Validate;
/** /**
* CachedEntity * CachedEntity
* *
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: CachedEntityImpl.java#3 $ * @version $Id: CachedEntityImpl.java#3 $
*/ */
@Deprecated
class CachedEntityImpl implements CachedEntity { class CachedEntityImpl implements CachedEntity {
private String cacheURI; private String cacheURI;
private HTTPCache cache; private HTTPCache cache;

View File

@ -39,6 +39,7 @@ import java.io.OutputStream;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: CachedResponse.java#3 $ * @version $Id: CachedResponse.java#3 $
*/ */
@Deprecated
interface CachedResponse { interface CachedResponse {
/** /**
* Writes the cached headers to the response * Writes the cached headers to the response

View File

@ -30,13 +30,17 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.lang.Validate;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.*; import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.lang.Validate;
/** /**
* CachedResponseImpl * CachedResponseImpl
@ -44,6 +48,7 @@ import java.util.*;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: CachedResponseImpl.java#4 $ * @version $Id: CachedResponseImpl.java#4 $
*/ */
@Deprecated
class CachedResponseImpl implements CachedResponse { class CachedResponseImpl implements CachedResponse {
final protected Map<String, List<String>> headers; final protected Map<String, List<String>> headers;
protected int headersSize; protected int headersSize;

View File

@ -42,6 +42,7 @@ import java.util.Map;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ClientCacheRequest.java#1 $ * @version $Id: ClientCacheRequest.java#1 $
*/ */
@Deprecated
public final class ClientCacheRequest extends AbstractCacheRequest { public final class ClientCacheRequest extends AbstractCacheRequest {
private Map<String, List<String>> parameters; private Map<String, List<String>> parameters;
private Map<String, List<String>> headers; private Map<String, List<String>> headers;

View File

@ -41,6 +41,7 @@ import java.io.OutputStream;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ClientCacheResponse.java#2 $ * @version $Id: ClientCacheResponse.java#2 $
*/ */
@Deprecated
public final class ClientCacheResponse extends AbstractCacheResponse { public final class ClientCacheResponse extends AbstractCacheResponse {
// It's quite useless to cache the data either on disk or in memory, as it already is cached in the client's cache... // It's quite useless to cache the data either on disk or in memory, as it already is cached in the client's cache...
// It would be nice if we could bypass that... // It would be nice if we could bypass that...

View File

@ -30,6 +30,14 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import com.twelvemonkeys.io.FileUtil; import com.twelvemonkeys.io.FileUtil;
import com.twelvemonkeys.lang.StringUtil; import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.lang.Validate; import com.twelvemonkeys.lang.Validate;
@ -38,13 +46,6 @@ import com.twelvemonkeys.net.MIMEUtil;
import com.twelvemonkeys.util.LRUHashMap; import com.twelvemonkeys.util.LRUHashMap;
import com.twelvemonkeys.util.NullMap; import com.twelvemonkeys.util.NullMap;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* A "simple" HTTP cache. * A "simple" HTTP cache.
* *
@ -95,6 +96,7 @@ import java.util.logging.Logger;
// TODO: Rewrite to use NIO for performance // TODO: Rewrite to use NIO for performance
// TODO: Allow no tempdir for in-memory only cache // TODO: Allow no tempdir for in-memory only cache
// TODO: Specify max size of disk-cache // TODO: Specify max size of disk-cache
@Deprecated
public class HTTPCache { public class HTTPCache {
/** /**
* The HTTP header {@code "Cache-Control"} * The HTTP header {@code "Cache-Control"}

View File

@ -39,6 +39,7 @@ import java.io.IOException;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ResponseResolver.java#2 $ * @version $Id: ResponseResolver.java#2 $
*/ */
@Deprecated
public interface ResponseResolver { public interface ResponseResolver {
void resolve(CacheRequest pRequest, CacheResponse pResponse) throws IOException, CacheException; void resolve(CacheRequest pRequest, CacheResponse pResponse) throws IOException, CacheException;
} }

View File

@ -30,19 +30,20 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.net.HTTPUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.net.HTTPUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
/** /**
* CacheResponseWrapper class description. * CacheResponseWrapper class description.
* <p> * <p>
@ -57,6 +58,7 @@ import java.util.Map;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: SerlvetCacheResponseWrapper.java#2 $ * @version $Id: SerlvetCacheResponseWrapper.java#2 $
*/ */
@Deprecated
class SerlvetCacheResponseWrapper extends HttpServletResponseWrapper { class SerlvetCacheResponseWrapper extends HttpServletResponseWrapper {
private ServletResponseStreamDelegate streamDelegate; private ServletResponseStreamDelegate streamDelegate;

View File

@ -30,13 +30,14 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.servlet.ServletUtil;
import javax.servlet.http.HttpServletRequest;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.twelvemonkeys.servlet.ServletUtil;
/** /**
* ServletCacheRequest * ServletCacheRequest
* *
@ -44,6 +45,7 @@ import java.util.Map;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ServletCacheRequest.java#1 $ * @version $Id: ServletCacheRequest.java#1 $
*/ */
@Deprecated
public final class ServletCacheRequest extends AbstractCacheRequest { public final class ServletCacheRequest extends AbstractCacheRequest {
private final HttpServletRequest request; private final HttpServletRequest request;

View File

@ -30,10 +30,11 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import javax.servlet.http.HttpServletResponse;
/** /**
* ServletCacheResponse * ServletCacheResponse
* *
@ -41,6 +42,7 @@ import java.io.OutputStream;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ServletCacheResponse.java#2 $ * @version $Id: ServletCacheResponse.java#2 $
*/ */
@Deprecated
public final class ServletCacheResponse extends AbstractCacheResponse { public final class ServletCacheResponse extends AbstractCacheResponse {
private HttpServletResponse response; private HttpServletResponse response;

View File

@ -30,10 +30,11 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import java.io.IOException;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/** /**
* ServletResponseResolver * ServletResponseResolver
@ -42,6 +43,7 @@ import java.io.IOException;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ServletResponseResolver.java#2 $ * @version $Id: ServletResponseResolver.java#2 $
*/ */
@Deprecated
final class ServletResponseResolver implements ResponseResolver { final class ServletResponseResolver implements ResponseResolver {
final private ServletCacheRequest request; final private ServletCacheRequest request;
final private ServletCacheResponse response; final private ServletCacheResponse response;

View File

@ -38,6 +38,7 @@ import java.io.OutputStream;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: WritableCachedResponse.java#2 $ * @version $Id: WritableCachedResponse.java#2 $
*/ */
@Deprecated
public interface WritableCachedResponse extends CachedResponse, CacheResponse { public interface WritableCachedResponse extends CachedResponse, CacheResponse {
/** /**
* Gets the {@code OutputStream} for this cached response. * Gets the {@code OutputStream} for this cached response.

View File

@ -30,9 +30,6 @@
package com.twelvemonkeys.servlet.cache; package com.twelvemonkeys.servlet.cache;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.net.HTTPUtil;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -40,12 +37,16 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.net.HTTPUtil;
/** /**
* WritableCachedResponseImpl * WritableCachedResponseImpl
* *
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: WritableCachedResponseImpl.java#3 $ * @version $Id: WritableCachedResponseImpl.java#3 $
*/ */
@Deprecated
class WritableCachedResponseImpl implements WritableCachedResponse { class WritableCachedResponseImpl implements WritableCachedResponse {
private final CachedResponseImpl cachedResponse; private final CachedResponseImpl cachedResponse;

View File

@ -36,6 +36,7 @@ package com.twelvemonkeys.servlet.fileupload;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: FileSizeExceededException.java#1 $ * @version $Id: FileSizeExceededException.java#1 $
*/ */
@Deprecated
public class FileSizeExceededException extends FileUploadException { public class FileSizeExceededException extends FileUploadException {
public FileSizeExceededException(Throwable pCause) { public FileSizeExceededException(Throwable pCause) {
super(pCause.getMessage(), pCause); super(pCause.getMessage(), pCause);

View File

@ -38,6 +38,7 @@ import javax.servlet.ServletException;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: FileUploadException.java#1 $ * @version $Id: FileUploadException.java#1 $
*/ */
@Deprecated
public class FileUploadException extends ServletException { public class FileUploadException extends ServletException {
public FileUploadException(String pMessage) { public FileUploadException(String pMessage) {
super(pMessage); super(pMessage);

View File

@ -30,20 +30,21 @@
package com.twelvemonkeys.servlet.fileupload; package com.twelvemonkeys.servlet.fileupload;
import com.twelvemonkeys.io.FileUtil; import java.io.File;
import com.twelvemonkeys.lang.StringUtil; import java.io.IOException;
import com.twelvemonkeys.servlet.GenericFilter; import java.net.MalformedURLException;
import com.twelvemonkeys.servlet.ServletUtil; import java.net.URL;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException; import com.twelvemonkeys.io.FileUtil;
import java.net.MalformedURLException; import com.twelvemonkeys.lang.StringUtil;
import java.net.URL; import com.twelvemonkeys.servlet.GenericFilter;
import com.twelvemonkeys.servlet.ServletUtil;
/** /**
* A servlet {@code Filter} for processing HTTP file upload requests, as * A servlet {@code Filter} for processing HTTP file upload requests, as
@ -55,6 +56,7 @@ import java.net.URL;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: FileUploadFilter.java#1 $ * @version $Id: FileUploadFilter.java#1 $
*/ */
@Deprecated
public class FileUploadFilter extends GenericFilter { public class FileUploadFilter extends GenericFilter {
private File uploadDir; private File uploadDir;
private long maxFileSize = 1024 * 1024; // 1 MByte private long maxFileSize = 1024 * 1024; // 1 MByte

View File

@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: HttpFileUploadRequest.java#1 $ * @version $Id: HttpFileUploadRequest.java#1 $
*/ */
@Deprecated
public interface HttpFileUploadRequest extends HttpServletRequest { public interface HttpFileUploadRequest extends HttpServletRequest {
/** /**
* Returns the value of a request parameter as an {@code UploadedFile}, * Returns the value of a request parameter as an {@code UploadedFile},

View File

@ -30,18 +30,23 @@
package com.twelvemonkeys.servlet.fileupload; package com.twelvemonkeys.servlet.fileupload;
import java.io.File;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUpload; import org.apache.commons.fileupload.FileUpload;
import org.apache.commons.fileupload.FileUploadBase; import org.apache.commons.fileupload.FileUploadBase;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletRequestContext; import org.apache.commons.fileupload.servlet.ServletRequestContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.File;
import java.util.*;
/** /**
* An {@code HttpFileUploadRequest} implementation, based on * An {@code HttpFileUploadRequest} implementation, based on
* <a href="http://jakarta.apache.org/commons/fileupload/">Jakarta Commons FileUpload</a>. * <a href="http://jakarta.apache.org/commons/fileupload/">Jakarta Commons FileUpload</a>.
@ -49,6 +54,7 @@ import java.util.*;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: HttpFileUploadRequestWrapper.java#1 $ * @version $Id: HttpFileUploadRequestWrapper.java#1 $
*/ */
@Deprecated
class HttpFileUploadRequestWrapper extends HttpServletRequestWrapper implements HttpFileUploadRequest { class HttpFileUploadRequestWrapper extends HttpServletRequestWrapper implements HttpFileUploadRequest {
private final Map<String, String[]> parameters = new HashMap<String, String[]>(); private final Map<String, String[]> parameters = new HashMap<String, String[]>();

View File

@ -40,6 +40,7 @@ import java.io.InputStream;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: UploadedFile.java#1 $ * @version $Id: UploadedFile.java#1 $
*/ */
@Deprecated
public interface UploadedFile { public interface UploadedFile {
/** /**
* Returns the length of file, in bytes. * Returns the length of file, in bytes.

View File

@ -30,13 +30,13 @@
package com.twelvemonkeys.servlet.fileupload; package com.twelvemonkeys.servlet.fileupload;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
/** /**
* An {@code UploadedFile} implementation, based on * An {@code UploadedFile} implementation, based on
* <a href="http://jakarta.apache.org/commons/fileupload/">Jakarta Commons FileUpload</a>. * <a href="http://jakarta.apache.org/commons/fileupload/">Jakarta Commons FileUpload</a>.
@ -44,6 +44,7 @@ import java.io.InputStream;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: UploadedFileImpl.java#1 $ * @version $Id: UploadedFileImpl.java#1 $
*/ */
@Deprecated
class UploadedFileImpl implements UploadedFile { class UploadedFileImpl implements UploadedFile {
private final FileItem item; private final FileItem item;

View File

@ -30,7 +30,7 @@
package com.twelvemonkeys.servlet.gzip; package com.twelvemonkeys.servlet.gzip;
import com.twelvemonkeys.servlet.GenericFilter; import java.io.IOException;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -38,7 +38,8 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import com.twelvemonkeys.servlet.GenericFilter;
/** /**
* A filter to reduce the output size of web resources. * A filter to reduce the output size of web resources.
@ -114,6 +115,7 @@ import java.io.IOException;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: GZIPFilter.java#1 $ * @version $Id: GZIPFilter.java#1 $
*/ */
@Deprecated
public class GZIPFilter extends GenericFilter { public class GZIPFilter extends GenericFilter {
{ {

View File

@ -30,16 +30,17 @@
package com.twelvemonkeys.servlet.gzip; package com.twelvemonkeys.servlet.gzip;
import com.twelvemonkeys.servlet.OutputStreamAdapter;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import com.twelvemonkeys.servlet.OutputStreamAdapter;
/** /**
* GZIPResponseWrapper class description. * GZIPResponseWrapper class description.
* <p> * <p>
@ -53,6 +54,7 @@ import java.util.zip.GZIPOutputStream;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: GZIPResponseWrapper.java#1 $ * @version $Id: GZIPResponseWrapper.java#1 $
*/ */
@Deprecated
public class GZIPResponseWrapper extends HttpServletResponseWrapper { public class GZIPResponseWrapper extends HttpServletResponseWrapper {
// TODO: Remove/update ETags if needed? Read the spec (RFC 2616) on Vary/ETag for caching // TODO: Remove/update ETags if needed? Read the spec (RFC 2616) on Vary/ETag for caching

View File

@ -30,13 +30,14 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.image.ImageUtil;
import javax.servlet.ServletRequest;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import javax.servlet.ServletRequest;
import com.twelvemonkeys.image.ImageUtil;
/** /**
* AWTImageFilterAdapter * AWTImageFilterAdapter
* *
@ -44,6 +45,7 @@ import java.awt.image.RenderedImage;
* @version $Id: AWTImageFilterAdapter.java#1 $ * @version $Id: AWTImageFilterAdapter.java#1 $
* *
*/ */
@Deprecated
public class AWTImageFilterAdapter extends ImageFilter { public class AWTImageFilterAdapter extends ImageFilter {
private java.awt.image.ImageFilter imageFilter = null; private java.awt.image.ImageFilter imageFilter = null;

View File

@ -30,11 +30,12 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import javax.servlet.ServletRequest;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp; import java.awt.image.BufferedImageOp;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import javax.servlet.ServletRequest;
/** /**
* BufferedImageOpAdapter * BufferedImageOpAdapter
* *
@ -42,6 +43,7 @@ import java.awt.image.RenderedImage;
* @version $Id: BufferedImageOpAdapter.java#1 $ * @version $Id: BufferedImageOpAdapter.java#1 $
* *
*/ */
@Deprecated
public class BufferedImageOpAdapter extends ImageFilter { public class BufferedImageOpAdapter extends ImageFilter {
private BufferedImageOp filter = null; private BufferedImageOp filter = null;

View File

@ -30,14 +30,15 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.servlet.GenericServlet; import java.io.IOException;
import java.util.zip.CRC32;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import java.io.IOException;
import java.util.zip.CRC32; import com.twelvemonkeys.servlet.GenericServlet;
/** /**
* Creates a minimal 1 x 1 pixel PNG image, in a color specified by the * Creates a minimal 1 x 1 pixel PNG image, in a color specified by the
@ -52,6 +53,7 @@ import java.util.zip.CRC32;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: ColorServlet.java#2 $ * @version $Id: ColorServlet.java#2 $
*/ */
@Deprecated
public class ColorServlet extends GenericServlet { public class ColorServlet extends GenericServlet {
private final static String RGB_PARAME = "color"; private final static String RGB_PARAME = "color";

View File

@ -30,17 +30,19 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import javax.servlet.ServletRequest;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import java.io.IOException; import java.io.IOException;
import javax.servlet.ServletRequest;
/** /**
* ComposeFilter * ComposeFilter
* *
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: ComposeFilter.java#1 $ * @version $Id: ComposeFilter.java#1 $
*/ */
@Deprecated
public class ComposeFilter extends ImageFilter { public class ComposeFilter extends ImageFilter {
protected RenderedImage doFilter(BufferedImage pImage, ServletRequest pRequest, ImageServletResponse pResponse) throws IOException { protected RenderedImage doFilter(BufferedImage pImage, ServletRequest pRequest, ImageServletResponse pResponse) throws IOException {
// 1. Load different image, locally (using ServletContext.getResource) // 1. Load different image, locally (using ServletContext.getResource)

View File

@ -30,16 +30,6 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import javax.imageio.ImageIO;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.IndexColorModel; import java.awt.image.IndexColorModel;
@ -49,6 +39,17 @@ import java.net.HttpURLConnection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.imageio.ImageIO;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
/** /**
* This filter implements server side content negotiation and transcoding for * This filter implements server side content negotiation and transcoding for
* images. * images.
@ -60,6 +61,7 @@ import java.util.Map;
// unneccessary conversion (as IE supports PNG, the latests FireFox supports // unneccessary conversion (as IE supports PNG, the latests FireFox supports
// JPEG and GIF, etc. even though they both don't explicitly list these formats // JPEG and GIF, etc. even though they both don't explicitly list these formats
// in their Accept headers). // in their Accept headers).
@Deprecated
public class ContentNegotiationFilter extends ImageFilter { public class ContentNegotiationFilter extends ImageFilter {
private final static String MIME_TYPE_IMAGE_PREFIX = "image/"; private final static String MIME_TYPE_IMAGE_PREFIX = "image/";

View File

@ -30,13 +30,14 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.servlet.ServletUtil;
import javax.servlet.ServletRequest;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import javax.servlet.ServletRequest;
import com.twelvemonkeys.servlet.ServletUtil;
/** /**
* This Servlet is able to render a cropped part of an image. * This Servlet is able to render a cropped part of an image.
* *
@ -96,6 +97,7 @@ import java.awt.image.RenderedImage;
* @author last modified by $Author: haku $ * @author last modified by $Author: haku $
* @version $Id: CropFilter.java#1 $ * @version $Id: CropFilter.java#1 $
*/ */
@Deprecated
public class CropFilter extends ScaleFilter { public class CropFilter extends ScaleFilter {
/** {@code cropX}*/ /** {@code cropX}*/
protected final static String PARAM_CROP_X = "cropX"; protected final static String PARAM_CROP_X = "cropX";

View File

@ -30,16 +30,21 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.GenericFilter;
import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import java.io.IOException; import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.GenericFilter;
/** /**
* Abstract base class for image filters. Automatically decoding and encoding of * Abstract base class for image filters. Automatically decoding and encoding of
* the image is handled in the {@code doFilterImpl} method. * the image is handled in the {@code doFilterImpl} method.
@ -50,6 +55,7 @@ import java.io.IOException;
* @version $Id: ImageFilter.java#2 $ * @version $Id: ImageFilter.java#2 $
* *
*/ */
@Deprecated
public abstract class ImageFilter extends GenericFilter { public abstract class ImageFilter extends GenericFilter {
// TODO: Take the design back to the drawing board (see ImageServletResponseImpl) // TODO: Take the design back to the drawing board (see ImageServletResponseImpl)
// - Allow multiple filters to set size attribute // - Allow multiple filters to set size attribute

View File

@ -41,6 +41,7 @@ import javax.servlet.ServletException;
* *
* @version $Id: ImageServletException.java#2 $ * @version $Id: ImageServletException.java#2 $
*/ */
@Deprecated
public class ImageServletException extends ServletException { public class ImageServletException extends ServletException {
public ImageServletException(String pMessage) { public ImageServletException(String pMessage) {

View File

@ -30,11 +30,12 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import javax.servlet.ServletResponse;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import java.io.IOException; import java.io.IOException;
import javax.servlet.ServletResponse;
/** /**
* ImageServletResponse. * ImageServletResponse.
* <p> * <p>
@ -46,6 +47,7 @@ import java.io.IOException;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: ImageServletResponse.java#4 $ * @version $Id: ImageServletResponse.java#4 $
*/ */
@Deprecated
public interface ImageServletResponse extends ServletResponse { public interface ImageServletResponse extends ServletResponse {
/** /**
* Request attribute of type {@link java.awt.Dimension} controlling image * Request attribute of type {@link java.awt.Dimension} controlling image

View File

@ -30,24 +30,6 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
import com.twelvemonkeys.servlet.ServletUtil;
import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest;
import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory;
import javax.imageio.*;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.IndexColorModel; import java.awt.image.IndexColorModel;
@ -60,6 +42,31 @@ import java.lang.reflect.Method;
import java.net.URL; import java.net.URL;
import java.util.Iterator; import java.util.Iterator;
import javax.imageio.IIOException;
import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
import com.twelvemonkeys.servlet.ServletUtil;
import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest;
import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory;
/** /**
* This {@link ImageServletResponse} implementation can be used with image * This {@link ImageServletResponse} implementation can be used with image
* requests, to have the image immediately decoded to a {@code BufferedImage}. * requests, to have the image immediately decoded to a {@code BufferedImage}.
@ -75,6 +82,7 @@ import java.util.Iterator;
// TODO: This implementation has a problem if two filters does scaling, as the second will overwrite the SIZE attribute // TODO: This implementation has a problem if two filters does scaling, as the second will overwrite the SIZE attribute
// TODO: Allow different scaling algorithm based on input image (use case: IndexColorModel does not scale well using default, smooth may be slow for large images) // TODO: Allow different scaling algorithm based on input image (use case: IndexColorModel does not scale well using default, smooth may be slow for large images)
// TODO: Support pluggable pre- and post-processing steps // TODO: Support pluggable pre- and post-processing steps
@Deprecated
class ImageServletResponseImpl extends HttpServletResponseWrapper implements ImageServletResponse { class ImageServletResponseImpl extends HttpServletResponseWrapper implements ImageServletResponse {
private ServletRequest originalRequest; private ServletRequest originalRequest;
private final ServletContext context; private final ServletContext context;

View File

@ -30,10 +30,11 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import javax.servlet.ServletRequest;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import javax.servlet.ServletRequest;
/** /**
* An {@code ImageFilter} that does nothing. Useful for debugging purposes. * An {@code ImageFilter} that does nothing. Useful for debugging purposes.
* *
@ -41,6 +42,7 @@ import java.awt.image.RenderedImage;
* @version $Id: NullImageFilter.java $ * @version $Id: NullImageFilter.java $
* *
*/ */
@Deprecated
public final class NullImageFilter extends ImageFilter { public final class NullImageFilter extends ImageFilter {
protected RenderedImage doFilter(BufferedImage pImage, ServletRequest pRequest, ImageServletResponse pResponse) { protected RenderedImage doFilter(BufferedImage pImage, ServletRequest pRequest, ImageServletResponse pResponse) {
return pImage; return pImage;

View File

@ -30,17 +30,18 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletUtil;
import javax.servlet.ServletRequest;
import java.awt.*; import java.awt.*;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import javax.servlet.ServletRequest;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletUtil;
/** /**
* This Servlet is able to render a cropped part of an image. * This Servlet is able to render a cropped part of an image.
* *
@ -81,6 +82,7 @@ import java.awt.image.RenderedImage;
*/ */
// TODO: Correct rounding errors, resulting in black borders when rotating 90 // TODO: Correct rounding errors, resulting in black borders when rotating 90
// degrees, and one of width or height is odd length... // degrees, and one of width or height is odd length...
@Deprecated
public class RotateFilter extends ImageFilter { public class RotateFilter extends ImageFilter {
/** {@code angle}*/ /** {@code angle}*/
protected final static String PARAM_ANGLE = "angle"; protected final static String PARAM_ANGLE = "angle";

View File

@ -30,16 +30,17 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletUtil;
import javax.servlet.ServletRequest;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import javax.servlet.ServletRequest;
import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletUtil;
/** /**
* This filter renders a scaled version of an image read from a * This filter renders a scaled version of an image read from a
@ -83,6 +84,7 @@ import java.lang.reflect.Field;
* @version $Id: ScaleFilter.java#1 $ * @version $Id: ScaleFilter.java#1 $
* *
*/ */
@Deprecated
public class ScaleFilter extends ImageFilter { public class ScaleFilter extends ImageFilter {
/** /**

View File

@ -30,16 +30,17 @@
package com.twelvemonkeys.servlet.image; package com.twelvemonkeys.servlet.image;
import com.twelvemonkeys.servlet.ServletUtil; import java.awt.*;
import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage;
import java.io.IOException;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import java.awt.*;
import java.awt.image.BufferedImage; import com.twelvemonkeys.servlet.ServletUtil;
import java.awt.image.RenderedImage;
import java.io.IOException;
/** /**
* A {@link javax.servlet.Filter} that extracts request parameters, and sets the * A {@link javax.servlet.Filter} that extracts request parameters, and sets the
@ -53,6 +54,7 @@ import java.io.IOException;
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a> * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: SourceRenderFilter.java#1 $ * @version $Id: SourceRenderFilter.java#1 $
*/ */
@Deprecated
public class SourceRenderFilter extends ImageFilter { public class SourceRenderFilter extends ImageFilter {
private String sizeWidthParam = "size.w"; private String sizeWidthParam = "size.w";
private String sizeHeightParam = "size.h"; private String sizeHeightParam = "size.h";

View File

@ -36,6 +36,7 @@ import java.awt.*;
* @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a> * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
* @version $Revision: $ * @version $Revision: $
*/ */
@Deprecated
public interface AreaOfInterest { public interface AreaOfInterest {
Rectangle getAOI(Rectangle pCrop); Rectangle getAOI(Rectangle pCrop);

View File

@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicReference;
* @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a> * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
* @version $Revision: $ * @version $Revision: $
*/ */
@Deprecated
public class AreaOfInterestFactory { public class AreaOfInterestFactory {
private final static AtomicReference<AreaOfInterestFactory> DEFAULT = private final static AtomicReference<AreaOfInterestFactory> DEFAULT =
new AtomicReference<AreaOfInterestFactory>(new AreaOfInterestFactory()); new AtomicReference<AreaOfInterestFactory>(new AreaOfInterestFactory());

View File

@ -30,14 +30,15 @@
package com.twelvemonkeys.servlet.image.aoi; package com.twelvemonkeys.servlet.image.aoi;
import com.twelvemonkeys.lang.Validate;
import java.awt.*; import java.awt.*;
import com.twelvemonkeys.lang.Validate;
/** /**
* @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a> * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
* @version $Revision: $ * @version $Revision: $
*/ */
@Deprecated
public class AreaOfInterestWrapper implements AreaOfInterest { public class AreaOfInterestWrapper implements AreaOfInterest {
private AreaOfInterest mDelegate; private AreaOfInterest mDelegate;

View File

@ -37,6 +37,7 @@ import java.awt.*;
* @author <a href="mailto:erlend@hamnaberg.net">Erlend Hamnaberg</a> * @author <a href="mailto:erlend@hamnaberg.net">Erlend Hamnaberg</a>
* @version $Revision: $ * @version $Revision: $
*/ */
@Deprecated
public class DefaultAreaOfInterest implements AreaOfInterest { public class DefaultAreaOfInterest implements AreaOfInterest {
private final int mOriginalWidth; private final int mOriginalWidth;
private final int mOriginalHeight; private final int mOriginalHeight;

View File

@ -36,6 +36,7 @@ import java.awt.*;
* @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a> * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
* @version $Revision: $ * @version $Revision: $
*/ */
@Deprecated
public class PercentAreaOfInterest extends DefaultAreaOfInterest { public class PercentAreaOfInterest extends DefaultAreaOfInterest {
public PercentAreaOfInterest(Dimension pOriginalDimension) { public PercentAreaOfInterest(Dimension pOriginalDimension) {

View File

@ -36,6 +36,7 @@ import java.awt.*;
* @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a> * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
* @version $Revision: $ * @version $Revision: $
*/ */
@Deprecated
public class UniformAreaOfInterest extends DefaultAreaOfInterest { public class UniformAreaOfInterest extends DefaultAreaOfInterest {
public UniformAreaOfInterest(Dimension pOriginalDimension) { public UniformAreaOfInterest(Dimension pOriginalDimension) {