Fixing javadoc and deprecations from merge

This commit is contained in:
Joakim Erdfelt 2018-04-20 11:51:00 -05:00
parent 8763c6065d
commit 877f0a112a
3 changed files with 3 additions and 26 deletions

View File

@ -90,7 +90,6 @@ public class ForwardedRequestCustomizer implements Customizer
* not support any {@code X-Forwarded-} headers. This convenience method
* clears all the non RFC headers if passed true and sets them to
* the default values (if not already set) if passed false.
* @param rfc7239only Configure to support only RFC7239
*/
public void setForwardedOnly(boolean rfc7239only)
{

View File

@ -151,10 +151,10 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
public static final String GZIP = "gzip";
public static final String DEFLATE = "deflate";
public static final int DEFAULT_MIN_GZIP_SIZE=16;
public static final int COMPRESSION_LEVEL = Deflater.DEFAULT_COMPRESSION;
private static final Logger LOG = Log.getLogger(GzipHandler.class);
private int _minGzipSize=DEFAULT_MIN_GZIP_SIZE;
private int _compressionLevel=Deflater.DEFAULT_COMPRESSION;
private boolean _syncFlush = false;
private int _inflateBufferSize = -1;
private EnumSet<DispatcherType> _dispatchers = EnumSet.of(DispatcherType.REQUEST);
@ -397,15 +397,6 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
super.doStart();
}
/**
* @deprecated feature will be removed in Jetty 10.x, with no replacement.
*/
@Deprecated
public int getCompressionLevel()
{
return _compressionLevel;
}
@Override
public Deflater getDeflater(Request request, long content_length)
{
@ -440,7 +431,7 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
Deflater df = _deflater.get();
if (df==null)
df=new Deflater(_compressionLevel,true);
df=new Deflater(COMPRESSION_LEVEL,true);
else
_deflater.set(null);
@ -756,19 +747,6 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
deflater.end();
}
/**
* @deprecated feature will be removed in Jetty 10.x, with no replacement.
@Deprecated
* Set the Compression level that {@link Deflater} uses.
*
* @param compressionLevel The compression level to use to initialize {@link Deflater#setLevel(int)}
* @see Deflater#setLevel(int)
*/
public void setCompressionLevel(int compressionLevel)
{
_compressionLevel = compressionLevel;
}
/**
* Set the excluded filter list of User-Agent patterns (replacing any previously set)
*

View File

@ -554,7 +554,7 @@ public class FileSessionDataStore extends AbstractSessionDataStore
/**
* Get the session id with its context and its expiry time
* @param data
* @param data the session data
* @return the session id plus context and expiry
*/
protected String getIdWithContextAndExpiry (SessionData data)