Remove the deprecated methods in SPDY and HTTP
No need to keep ABI compatibility since we are working on a backward-incompatible branch
This commit is contained in:
parent
20adbb325e
commit
6071c9c267
@ -23,12 +23,6 @@ import java.util.Set;
|
|||||||
*/
|
*/
|
||||||
public interface Cookie extends Comparable<Cookie> {
|
public interface Cookie extends Comparable<Cookie> {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #name()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getName();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the name of this {@link Cookie}.
|
* Returns the name of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -36,12 +30,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
String name();
|
String name();
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #value()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getValue();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the value of this {@link Cookie}.
|
* Returns the value of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -56,12 +44,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setValue(String value);
|
void setValue(String value);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #domain()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getDomain();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the domain of this {@link Cookie}.
|
* Returns the domain of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -76,12 +58,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setDomain(String domain);
|
void setDomain(String domain);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #path()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getPath();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the path of this {@link Cookie}.
|
* Returns the path of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -96,12 +72,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setPath(String path);
|
void setPath(String path);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #comment()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getComment();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the comment of this {@link Cookie}.
|
* Returns the comment of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -116,12 +86,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setComment(String comment);
|
void setComment(String comment);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #maxAge()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
long getMaxAge();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the maximum age of this {@link Cookie} in seconds or {@link Long#MIN_VALUE} if unspecified
|
* Returns the maximum age of this {@link Cookie} in seconds or {@link Long#MIN_VALUE} if unspecified
|
||||||
*
|
*
|
||||||
@ -140,12 +104,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setMaxAge(long maxAge);
|
void setMaxAge(long maxAge);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #version()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getVersion();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the version of this {@link Cookie}.
|
* Returns the version of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -195,12 +153,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setHttpOnly(boolean httpOnly);
|
void setHttpOnly(boolean httpOnly);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #commentUrl()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getCommentUrl();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the comment URL of this {@link Cookie}.
|
* Returns the comment URL of this {@link Cookie}.
|
||||||
*
|
*
|
||||||
@ -232,12 +184,6 @@ public interface Cookie extends Comparable<Cookie> {
|
|||||||
*/
|
*/
|
||||||
void setDiscard(boolean discard);
|
void setDiscard(boolean discard);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #ports()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
Set<Integer> getPorts();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the ports that this {@link Cookie} can be accessed on.
|
* Returns the ports that this {@link Cookie} can be accessed on.
|
||||||
*
|
*
|
||||||
|
@ -77,23 +77,11 @@ public class DefaultCookie implements Cookie {
|
|||||||
setValue(value);
|
setValue(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getName() {
|
|
||||||
return name();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getValue() {
|
|
||||||
return value();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String value() {
|
public String value() {
|
||||||
return value;
|
return value;
|
||||||
@ -107,12 +95,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
this.value = value;
|
this.value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getDomain() {
|
|
||||||
return domain();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String domain() {
|
public String domain() {
|
||||||
return domain;
|
return domain;
|
||||||
@ -123,12 +105,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
this.domain = validateValue("domain", domain);
|
this.domain = validateValue("domain", domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getPath() {
|
|
||||||
return path();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String path() {
|
public String path() {
|
||||||
return path;
|
return path;
|
||||||
@ -139,12 +115,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
this.path = validateValue("path", path);
|
this.path = validateValue("path", path);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getComment() {
|
|
||||||
return comment();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String comment() {
|
public String comment() {
|
||||||
return comment;
|
return comment;
|
||||||
@ -155,12 +125,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
this.comment = validateValue("comment", comment);
|
this.comment = validateValue("comment", comment);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getCommentUrl() {
|
|
||||||
return commentUrl();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String commentUrl() {
|
public String commentUrl() {
|
||||||
return commentUrl;
|
return commentUrl;
|
||||||
@ -181,12 +145,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
this.discard = discard;
|
this.discard = discard;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public Set<Integer> getPorts() {
|
|
||||||
return ports();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<Integer> ports() {
|
public Set<Integer> ports() {
|
||||||
if (unmodifiablePorts == null) {
|
if (unmodifiablePorts == null) {
|
||||||
@ -234,12 +192,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public long getMaxAge() {
|
|
||||||
return maxAge();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long maxAge() {
|
public long maxAge() {
|
||||||
return maxAge;
|
return maxAge;
|
||||||
@ -250,12 +202,6 @@ public class DefaultCookie implements Cookie {
|
|||||||
this.maxAge = maxAge;
|
this.maxAge = maxAge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getVersion() {
|
|
||||||
return version();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int version() {
|
public int version() {
|
||||||
return version;
|
return version;
|
||||||
|
@ -50,12 +50,6 @@ public abstract class DefaultHttpMessage extends DefaultHttpObject implements Ht
|
|||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public HttpVersion getProtocolVersion() {
|
|
||||||
return protocolVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HttpVersion protocolVersion() {
|
public HttpVersion protocolVersion() {
|
||||||
return version;
|
return version;
|
||||||
|
@ -56,23 +56,11 @@ public class DefaultHttpRequest extends DefaultHttpMessage implements HttpReques
|
|||||||
this.uri = uri;
|
this.uri = uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public HttpMethod getMethod() {
|
|
||||||
return method();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HttpMethod method() {
|
public HttpMethod method() {
|
||||||
return method;
|
return method;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public String getUri() {
|
|
||||||
return uri();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String uri() {
|
public String uri() {
|
||||||
return uri;
|
return uri;
|
||||||
|
@ -49,12 +49,6 @@ public class DefaultHttpResponse extends DefaultHttpMessage implements HttpRespo
|
|||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public HttpResponseStatus getStatus() {
|
|
||||||
return status();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HttpResponseStatus status() {
|
public HttpResponseStatus status() {
|
||||||
return status;
|
return status;
|
||||||
|
@ -167,7 +167,7 @@ public class HttpClientUpgradeHandler extends HttpObjectAggregator {
|
|||||||
response = (FullHttpResponse) out.get(0);
|
response = (FullHttpResponse) out.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!SWITCHING_PROTOCOLS.equals(response.getStatus())) {
|
if (!SWITCHING_PROTOCOLS.equals(response.status())) {
|
||||||
// The server does not support the requested protocol, just remove this handler
|
// The server does not support the requested protocol, just remove this handler
|
||||||
// and continue processing HTTP.
|
// and continue processing HTTP.
|
||||||
// NOTE: not releasing the response since we're letting it propagate to the
|
// NOTE: not releasing the response since we're letting it propagate to the
|
||||||
|
@ -24,13 +24,8 @@ import io.netty.handler.codec.http.HttpHeaders.Values;
|
|||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static io.netty.handler.codec.http.HttpConstants.*;
|
|
||||||
|
|
||||||
public final class HttpHeaderUtil {
|
public final class HttpHeaderUtil {
|
||||||
|
|
||||||
private static final byte[] HEADER_SEPERATOR = { COLON, SP };
|
|
||||||
private static final byte[] CRLF = { CR, LF };
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns {@code true} if and only if the connection can remain open and
|
* Returns {@code true} if and only if the connection can remain open and
|
||||||
* thus 'kept alive'. This methods respects the value of the
|
* thus 'kept alive'. This methods respects the value of the
|
||||||
@ -43,7 +38,7 @@ public final class HttpHeaderUtil {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message.getProtocolVersion().isKeepAliveDefault()) {
|
if (message.protocolVersion().isKeepAliveDefault()) {
|
||||||
return !AsciiString.equalsIgnoreCase(Values.CLOSE, connection);
|
return !AsciiString.equalsIgnoreCase(Values.CLOSE, connection);
|
||||||
} else {
|
} else {
|
||||||
return AsciiString.equalsIgnoreCase(Values.KEEP_ALIVE, connection);
|
return AsciiString.equalsIgnoreCase(Values.KEEP_ALIVE, connection);
|
||||||
@ -71,7 +66,7 @@ public final class HttpHeaderUtil {
|
|||||||
*/
|
*/
|
||||||
public static void setKeepAlive(HttpMessage message, boolean keepAlive) {
|
public static void setKeepAlive(HttpMessage message, boolean keepAlive) {
|
||||||
HttpHeaders h = message.headers();
|
HttpHeaders h = message.headers();
|
||||||
if (message.getProtocolVersion().isKeepAliveDefault()) {
|
if (message.protocolVersion().isKeepAliveDefault()) {
|
||||||
if (keepAlive) {
|
if (keepAlive) {
|
||||||
h.remove(Names.CONNECTION);
|
h.remove(Names.CONNECTION);
|
||||||
} else {
|
} else {
|
||||||
@ -155,14 +150,14 @@ public final class HttpHeaderUtil {
|
|||||||
HttpHeaders h = message.headers();
|
HttpHeaders h = message.headers();
|
||||||
if (message instanceof HttpRequest) {
|
if (message instanceof HttpRequest) {
|
||||||
HttpRequest req = (HttpRequest) message;
|
HttpRequest req = (HttpRequest) message;
|
||||||
if (HttpMethod.GET.equals(req.getMethod()) &&
|
if (HttpMethod.GET.equals(req.method()) &&
|
||||||
h.contains(Names.SEC_WEBSOCKET_KEY1) &&
|
h.contains(Names.SEC_WEBSOCKET_KEY1) &&
|
||||||
h.contains(Names.SEC_WEBSOCKET_KEY2)) {
|
h.contains(Names.SEC_WEBSOCKET_KEY2)) {
|
||||||
return 8;
|
return 8;
|
||||||
}
|
}
|
||||||
} else if (message instanceof HttpResponse) {
|
} else if (message instanceof HttpResponse) {
|
||||||
HttpResponse res = (HttpResponse) message;
|
HttpResponse res = (HttpResponse) message;
|
||||||
if (res.getStatus().code() == 101 &&
|
if (res.status().code() == 101 &&
|
||||||
h.contains(Names.SEC_WEBSOCKET_ORIGIN) &&
|
h.contains(Names.SEC_WEBSOCKET_ORIGIN) &&
|
||||||
h.contains(Names.SEC_WEBSOCKET_LOCATION)) {
|
h.contains(Names.SEC_WEBSOCKET_LOCATION)) {
|
||||||
return 16;
|
return 16;
|
||||||
@ -195,7 +190,7 @@ public final class HttpHeaderUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// It works only on HTTP/1.1 or later.
|
// It works only on HTTP/1.1 or later.
|
||||||
if (message.getProtocolVersion().compareTo(HttpVersion.HTTP_1_1) < 0) {
|
if (message.protocolVersion().compareTo(HttpVersion.HTTP_1_1) < 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,12 +26,6 @@ package io.netty.handler.codec.http;
|
|||||||
*/
|
*/
|
||||||
public interface HttpMessage extends HttpObject {
|
public interface HttpMessage extends HttpObject {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #protocolVersion()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
HttpVersion getProtocolVersion();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the protocol version of this {@link HttpMessage}
|
* Returns the protocol version of this {@link HttpMessage}
|
||||||
*/
|
*/
|
||||||
|
@ -33,12 +33,6 @@ package io.netty.handler.codec.http;
|
|||||||
*/
|
*/
|
||||||
public interface HttpRequest extends HttpMessage {
|
public interface HttpRequest extends HttpMessage {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #method()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
HttpMethod getMethod();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the {@link HttpMethod} of this {@link HttpRequest}.
|
* Returns the {@link HttpMethod} of this {@link HttpRequest}.
|
||||||
*
|
*
|
||||||
@ -51,12 +45,6 @@ public interface HttpRequest extends HttpMessage {
|
|||||||
*/
|
*/
|
||||||
HttpRequest setMethod(HttpMethod method);
|
HttpRequest setMethod(HttpMethod method);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #uri()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
String getUri();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the requested URI (or alternatively, path)
|
* Returns the requested URI (or alternatively, path)
|
||||||
*
|
*
|
||||||
|
@ -31,12 +31,6 @@ package io.netty.handler.codec.http;
|
|||||||
*/
|
*/
|
||||||
public interface HttpResponse extends HttpMessage {
|
public interface HttpResponse extends HttpMessage {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #status()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
HttpResponseStatus getStatus();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the status of this {@link HttpResponse}.
|
* Returns the status of this {@link HttpResponse}.
|
||||||
*
|
*
|
||||||
|
@ -1131,31 +1131,16 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public HttpMethod getMethod() {
|
|
||||||
return request.method();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HttpMethod method() {
|
public HttpMethod method() {
|
||||||
return request.method();
|
return request.method();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getUri() {
|
|
||||||
return request.uri();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String uri() {
|
public String uri() {
|
||||||
return request.uri();
|
return request.uri();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public HttpVersion getProtocolVersion() {
|
|
||||||
return request.protocolVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HttpVersion protocolVersion() {
|
public HttpVersion protocolVersion() {
|
||||||
return request.protocolVersion();
|
return request.protocolVersion();
|
||||||
@ -1206,7 +1191,7 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
|
|||||||
@Override
|
@Override
|
||||||
public FullHttpRequest copy() {
|
public FullHttpRequest copy() {
|
||||||
DefaultFullHttpRequest copy = new DefaultFullHttpRequest(
|
DefaultFullHttpRequest copy = new DefaultFullHttpRequest(
|
||||||
getProtocolVersion(), getMethod(), getUri(), content().copy());
|
protocolVersion(), method(), uri(), content().copy());
|
||||||
copy.headers().set(headers());
|
copy.headers().set(headers());
|
||||||
copy.trailingHeaders().set(trailingHeaders());
|
copy.trailingHeaders().set(trailingHeaders());
|
||||||
return copy;
|
return copy;
|
||||||
@ -1215,7 +1200,7 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
|
|||||||
@Override
|
@Override
|
||||||
public FullHttpRequest duplicate() {
|
public FullHttpRequest duplicate() {
|
||||||
DefaultFullHttpRequest duplicate = new DefaultFullHttpRequest(
|
DefaultFullHttpRequest duplicate = new DefaultFullHttpRequest(
|
||||||
getProtocolVersion(), getMethod(), getUri(), content().duplicate());
|
protocolVersion(), method(), uri(), content().duplicate());
|
||||||
duplicate.headers().set(headers());
|
duplicate.headers().set(headers());
|
||||||
duplicate.trailingHeaders().set(trailingHeaders());
|
duplicate.trailingHeaders().set(trailingHeaders());
|
||||||
return duplicate;
|
return duplicate;
|
||||||
|
@ -109,14 +109,6 @@ public class WebSocketServerHandshakerFactory {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated use {@link #sendUnsupportedVersionResponse(Channel)}
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static void sendUnsupportedWebSocketVersionResponse(Channel channel) {
|
|
||||||
sendUnsupportedVersionResponse(channel);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return that we need cannot not support the web socket version
|
* Return that we need cannot not support the web socket version
|
||||||
*/
|
*/
|
||||||
|
@ -55,12 +55,6 @@ public class DefaultSpdyGoAwayFrame implements SpdyGoAwayFrame {
|
|||||||
setStatus(status);
|
setStatus(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getLastGoodStreamId() {
|
|
||||||
return lastGoodStreamId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int lastGoodStreamId() {
|
public int lastGoodStreamId() {
|
||||||
return lastGoodStreamId;
|
return lastGoodStreamId;
|
||||||
@ -76,12 +70,6 @@ public class DefaultSpdyGoAwayFrame implements SpdyGoAwayFrame {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public SpdySessionStatus getStatus() {
|
|
||||||
return status();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SpdySessionStatus status() {
|
public SpdySessionStatus status() {
|
||||||
return status;
|
return status;
|
||||||
|
@ -33,12 +33,6 @@ public class DefaultSpdyPingFrame implements SpdyPingFrame {
|
|||||||
setId(id);
|
setId(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getId() {
|
|
||||||
return id();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int id() {
|
public int id() {
|
||||||
return id;
|
return id;
|
||||||
|
@ -58,12 +58,6 @@ public class DefaultSpdyRstStreamFrame extends DefaultSpdyStreamFrame
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public SpdyStreamStatus getStatus() {
|
|
||||||
return status();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SpdyStreamStatus status() {
|
public SpdyStreamStatus status() {
|
||||||
return status;
|
return status;
|
||||||
|
@ -29,12 +29,6 @@ public class DefaultSpdySettingsFrame implements SpdySettingsFrame {
|
|||||||
private boolean clear;
|
private boolean clear;
|
||||||
private final Map<Integer, Setting> settingsMap = new TreeMap<Integer, Setting>();
|
private final Map<Integer, Setting> settingsMap = new TreeMap<Integer, Setting>();
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public Set<Integer> getIds() {
|
|
||||||
return ids();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<Integer> ids() {
|
public Set<Integer> ids() {
|
||||||
return settingsMap.keySet();
|
return settingsMap.keySet();
|
||||||
|
@ -32,12 +32,6 @@ public abstract class DefaultSpdyStreamFrame implements SpdyStreamFrame {
|
|||||||
setStreamId(streamId);
|
setStreamId(streamId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getStreamId() {
|
|
||||||
return streamId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int streamId() {
|
public int streamId() {
|
||||||
return streamId;
|
return streamId;
|
||||||
|
@ -58,23 +58,11 @@ public class DefaultSpdySynStreamFrame extends DefaultSpdyHeadersFrame
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getAssociatedToStreamId() {
|
|
||||||
return associatedStreamId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int associatedStreamId() {
|
public int associatedStreamId() {
|
||||||
return associatedStreamId;
|
return associatedStreamId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public SpdySynStreamFrame setAssociatedToStreamId(int associatedToStreamId) {
|
|
||||||
return setAssociatedStreamId(associatedToStreamId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId) {
|
public SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId) {
|
||||||
if (associatedStreamId < 0) {
|
if (associatedStreamId < 0) {
|
||||||
@ -86,12 +74,6 @@ public class DefaultSpdySynStreamFrame extends DefaultSpdyHeadersFrame
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public byte getPriority() {
|
|
||||||
return priority();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte priority() {
|
public byte priority() {
|
||||||
return priority;
|
return priority;
|
||||||
|
@ -36,12 +36,6 @@ public class DefaultSpdyWindowUpdateFrame implements SpdyWindowUpdateFrame {
|
|||||||
setDeltaWindowSize(deltaWindowSize);
|
setDeltaWindowSize(deltaWindowSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getStreamId() {
|
|
||||||
return streamId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int streamId() {
|
public int streamId() {
|
||||||
return streamId;
|
return streamId;
|
||||||
@ -57,12 +51,6 @@ public class DefaultSpdyWindowUpdateFrame implements SpdyWindowUpdateFrame {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public int getDeltaWindowSize() {
|
|
||||||
return deltaWindowSize();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int deltaWindowSize() {
|
public int deltaWindowSize() {
|
||||||
return deltaWindowSize;
|
return deltaWindowSize;
|
||||||
|
@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy;
|
|||||||
*/
|
*/
|
||||||
public interface SpdyGoAwayFrame extends SpdyFrame {
|
public interface SpdyGoAwayFrame extends SpdyFrame {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #lastGoodStreamId()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getLastGoodStreamId();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Last-good-stream-ID of this frame.
|
* Returns the Last-good-stream-ID of this frame.
|
||||||
*/
|
*/
|
||||||
@ -37,12 +31,6 @@ public interface SpdyGoAwayFrame extends SpdyFrame {
|
|||||||
*/
|
*/
|
||||||
SpdyGoAwayFrame setLastGoodStreamId(int lastGoodStreamId);
|
SpdyGoAwayFrame setLastGoodStreamId(int lastGoodStreamId);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #status()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
SpdySessionStatus getStatus();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the status of this frame.
|
* Returns the status of this frame.
|
||||||
*/
|
*/
|
||||||
|
@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy;
|
|||||||
*/
|
*/
|
||||||
public interface SpdyPingFrame extends SpdyFrame {
|
public interface SpdyPingFrame extends SpdyFrame {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #id()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getId();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the ID of this frame.
|
* Returns the ID of this frame.
|
||||||
*/
|
*/
|
||||||
|
@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy;
|
|||||||
*/
|
*/
|
||||||
public interface SpdyRstStreamFrame extends SpdyStreamFrame {
|
public interface SpdyRstStreamFrame extends SpdyStreamFrame {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #status()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
SpdyStreamStatus getStatus();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the status of this frame.
|
* Returns the status of this frame.
|
||||||
*/
|
*/
|
||||||
|
@ -73,14 +73,6 @@ public class SpdySessionStatus implements Comparable<SpdySessionStatus> {
|
|||||||
this.statusPhrase = statusPhrase;
|
this.statusPhrase = statusPhrase;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #code()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public int getCode() {
|
|
||||||
return code();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the code of this status.
|
* Returns the code of this status.
|
||||||
*/
|
*/
|
||||||
@ -88,14 +80,6 @@ public class SpdySessionStatus implements Comparable<SpdySessionStatus> {
|
|||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #statusPhrase()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public String getStatusPhrase() {
|
|
||||||
return statusPhrase();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the status phrase of this status.
|
* Returns the status phrase of this status.
|
||||||
*/
|
*/
|
||||||
|
@ -32,12 +32,6 @@ public interface SpdySettingsFrame extends SpdyFrame {
|
|||||||
int SETTINGS_INITIAL_WINDOW_SIZE = 7;
|
int SETTINGS_INITIAL_WINDOW_SIZE = 7;
|
||||||
int SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8;
|
int SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8;
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #ids()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
Set<Integer> getIds();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a {@code Set} of the setting IDs.
|
* Returns a {@code Set} of the setting IDs.
|
||||||
* The set's iterator will return the IDs in ascending order.
|
* The set's iterator will return the IDs in ascending order.
|
||||||
|
@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy;
|
|||||||
*/
|
*/
|
||||||
public interface SpdyStreamFrame extends SpdyFrame {
|
public interface SpdyStreamFrame extends SpdyFrame {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #streamId()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getStreamId();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Stream-ID of this frame.
|
* Returns the Stream-ID of this frame.
|
||||||
*/
|
*/
|
||||||
|
@ -147,14 +147,6 @@ public class SpdyStreamStatus implements Comparable<SpdyStreamStatus> {
|
|||||||
this.statusPhrase = statusPhrase;
|
this.statusPhrase = statusPhrase;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #code()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public int getCode() {
|
|
||||||
return code();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the code of this status.
|
* Returns the code of this status.
|
||||||
*/
|
*/
|
||||||
@ -162,14 +154,6 @@ public class SpdyStreamStatus implements Comparable<SpdyStreamStatus> {
|
|||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #statusPhrase()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public String getStatusPhrase() {
|
|
||||||
return statusPhrase();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the status phrase of this status.
|
* Returns the status phrase of this status.
|
||||||
*/
|
*/
|
||||||
|
@ -20,35 +20,17 @@ package io.netty.handler.codec.spdy;
|
|||||||
*/
|
*/
|
||||||
public interface SpdySynStreamFrame extends SpdyHeadersFrame {
|
public interface SpdySynStreamFrame extends SpdyHeadersFrame {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #associatedStreamId()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getAssociatedToStreamId();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Associated-To-Stream-ID of this frame.
|
* Returns the Associated-To-Stream-ID of this frame.
|
||||||
*/
|
*/
|
||||||
int associatedStreamId();
|
int associatedStreamId();
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #setAssociatedStreamId(int)} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
SpdySynStreamFrame setAssociatedToStreamId(int associatedToStreamId);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the Associated-To-Stream-ID of this frame.
|
* Sets the Associated-To-Stream-ID of this frame.
|
||||||
* The Associated-To-Stream-ID cannot be negative.
|
* The Associated-To-Stream-ID cannot be negative.
|
||||||
*/
|
*/
|
||||||
SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId);
|
SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId);
|
||||||
|
|
||||||
/**
|
|
||||||
* Use {@link #priority()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
byte getPriority();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the priority of the stream.
|
* Returns the priority of the stream.
|
||||||
*/
|
*/
|
||||||
|
@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy;
|
|||||||
*/
|
*/
|
||||||
public interface SpdyWindowUpdateFrame extends SpdyFrame {
|
public interface SpdyWindowUpdateFrame extends SpdyFrame {
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #streamId()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getStreamId();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Stream-ID of this frame.
|
* Returns the Stream-ID of this frame.
|
||||||
*/
|
*/
|
||||||
@ -36,12 +30,6 @@ public interface SpdyWindowUpdateFrame extends SpdyFrame {
|
|||||||
*/
|
*/
|
||||||
SpdyWindowUpdateFrame setStreamId(int streamID);
|
SpdyWindowUpdateFrame setStreamId(int streamID);
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #deltaWindowSize()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int getDeltaWindowSize();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Delta-Window-Size of this frame.
|
* Returns the Delta-Window-Size of this frame.
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user