diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java index 5e79783b0a..86f4ecc1cc 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java @@ -55,12 +55,6 @@ public class DefaultSpdyGoAwayFrame implements SpdyGoAwayFrame { setStatus(status); } - @Override - @Deprecated - public int getLastGoodStreamId() { - return lastGoodStreamId(); - } - @Override public int lastGoodStreamId() { return lastGoodStreamId; @@ -76,12 +70,6 @@ public class DefaultSpdyGoAwayFrame implements SpdyGoAwayFrame { return this; } - @Override - @Deprecated - public SpdySessionStatus getStatus() { - return status(); - } - @Override public SpdySessionStatus status() { return status; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java index 7f697d53ad..2af2b72bdb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java @@ -33,12 +33,6 @@ public class DefaultSpdyPingFrame implements SpdyPingFrame { setId(id); } - @Override - @Deprecated - public int getId() { - return id(); - } - @Override public int id() { return id; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java index a8874bd8aa..a63f7db9da 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java @@ -58,12 +58,6 @@ public class DefaultSpdyRstStreamFrame extends DefaultSpdyStreamFrame return this; } - @Override - @Deprecated - public SpdyStreamStatus getStatus() { - return status(); - } - @Override public SpdyStreamStatus status() { return status; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java index 505b3713cb..c37e41cece 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java @@ -29,12 +29,6 @@ public class DefaultSpdySettingsFrame implements SpdySettingsFrame { private boolean clear; private final Map settingsMap = new TreeMap(); - @Override - @Deprecated - public Set getIds() { - return ids(); - } - @Override public Set ids() { return settingsMap.keySet(); diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java index 7a8b94e1df..4618d4d4a9 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java @@ -32,12 +32,6 @@ public abstract class DefaultSpdyStreamFrame implements SpdyStreamFrame { setStreamId(streamId); } - @Override - @Deprecated - public int getStreamId() { - return streamId(); - } - @Override public int streamId() { return streamId; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java index a394770dda..5f012903d1 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java @@ -58,23 +58,11 @@ public class DefaultSpdySynStreamFrame extends DefaultSpdyHeadersFrame return this; } - @Override - @Deprecated - public int getAssociatedToStreamId() { - return associatedStreamId(); - } - @Override public int associatedStreamId() { return associatedStreamId; } - @Override - @Deprecated - public SpdySynStreamFrame setAssociatedToStreamId(int associatedToStreamId) { - return setAssociatedStreamId(associatedToStreamId); - } - @Override public SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId) { if (associatedStreamId < 0) { @@ -86,12 +74,6 @@ public class DefaultSpdySynStreamFrame extends DefaultSpdyHeadersFrame return this; } - @Override - @Deprecated - public byte getPriority() { - return priority(); - } - @Override public byte priority() { return priority; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java index 1ec8672af8..1f30aa4e05 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java @@ -36,12 +36,6 @@ public class DefaultSpdyWindowUpdateFrame implements SpdyWindowUpdateFrame { setDeltaWindowSize(deltaWindowSize); } - @Override - @Deprecated - public int getStreamId() { - return streamId(); - } - @Override public int streamId() { return streamId; @@ -57,12 +51,6 @@ public class DefaultSpdyWindowUpdateFrame implements SpdyWindowUpdateFrame { return this; } - @Override - @Deprecated - public int getDeltaWindowSize() { - return deltaWindowSize(); - } - @Override public int deltaWindowSize() { return deltaWindowSize; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java index e1f7e1bcf0..d2abb19b37 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java @@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy; */ public interface SpdyGoAwayFrame extends SpdyFrame { - /** - * @deprecated Use {@link #lastGoodStreamId()} instead. - */ - @Deprecated - int getLastGoodStreamId(); - /** * Returns the Last-good-stream-ID of this frame. */ @@ -37,12 +31,6 @@ public interface SpdyGoAwayFrame extends SpdyFrame { */ SpdyGoAwayFrame setLastGoodStreamId(int lastGoodStreamId); - /** - * @deprecated Use {@link #status()} instead. - */ - @Deprecated - SpdySessionStatus getStatus(); - /** * Returns the status of this frame. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyPingFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyPingFrame.java index 0bc947148d..fc124f8d31 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyPingFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyPingFrame.java @@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy; */ public interface SpdyPingFrame extends SpdyFrame { - /** - * @deprecated Use {@link #id()} instead. - */ - @Deprecated - int getId(); - /** * Returns the ID of this frame. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java index f3924671d4..44cadb2c60 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java @@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy; */ public interface SpdyRstStreamFrame extends SpdyStreamFrame { - /** - * @deprecated Use {@link #status()} instead. - */ - @Deprecated - SpdyStreamStatus getStatus(); - /** * Returns the status of this frame. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java index caff4b9ecc..fd79d1ed12 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java @@ -73,14 +73,6 @@ public class SpdySessionStatus implements Comparable { this.statusPhrase = statusPhrase; } - /** - * @deprecated Use {@link #code()} instead. - */ - @Deprecated - public int getCode() { - return code(); - } - /** * Returns the code of this status. */ @@ -88,14 +80,6 @@ public class SpdySessionStatus implements Comparable { return code; } - /** - * @deprecated Use {@link #statusPhrase()} instead. - */ - @Deprecated - public String getStatusPhrase() { - return statusPhrase(); - } - /** * Returns the status phrase of this status. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySettingsFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySettingsFrame.java index 7ec658776e..e24f41a020 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySettingsFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySettingsFrame.java @@ -32,12 +32,6 @@ public interface SpdySettingsFrame extends SpdyFrame { int SETTINGS_INITIAL_WINDOW_SIZE = 7; int SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8; - /** - * @deprecated Use {@link #ids()} instead. - */ - @Deprecated - Set getIds(); - /** * Returns a {@code Set} of the setting IDs. * The set's iterator will return the IDs in ascending order. diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamFrame.java index ca465991b8..09c9f2a179 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamFrame.java @@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy; */ public interface SpdyStreamFrame extends SpdyFrame { - /** - * @deprecated Use {@link #streamId()} instead. - */ - @Deprecated - int getStreamId(); - /** * Returns the Stream-ID of this frame. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java index 912b107a79..75ed740a2a 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java @@ -147,14 +147,6 @@ public class SpdyStreamStatus implements Comparable { this.statusPhrase = statusPhrase; } - /** - * @deprecated Use {@link #code()} instead. - */ - @Deprecated - public int getCode() { - return code(); - } - /** * Returns the code of this status. */ @@ -162,14 +154,6 @@ public class SpdyStreamStatus implements Comparable { return code; } - /** - * @deprecated Use {@link #statusPhrase()} instead. - */ - @Deprecated - public String getStatusPhrase() { - return statusPhrase(); - } - /** * Returns the status phrase of this status. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySynStreamFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySynStreamFrame.java index d0c2acf047..f2efb8cabe 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySynStreamFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySynStreamFrame.java @@ -20,35 +20,17 @@ package io.netty.handler.codec.spdy; */ public interface SpdySynStreamFrame extends SpdyHeadersFrame { - /** - * @deprecated Use {@link #associatedStreamId()} instead. - */ - @Deprecated - int getAssociatedToStreamId(); - /** * Returns the Associated-To-Stream-ID of this frame. */ int associatedStreamId(); - /** - * @deprecated Use {@link #setAssociatedStreamId(int)} instead. - */ - @Deprecated - SpdySynStreamFrame setAssociatedToStreamId(int associatedToStreamId); - /** * Sets the Associated-To-Stream-ID of this frame. * The Associated-To-Stream-ID cannot be negative. */ SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId); - /** - * Use {@link #priority()} instead. - */ - @Deprecated - byte getPriority(); - /** * Returns the priority of the stream. */ diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java index 0ecd308ab0..bbd8730bd0 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java @@ -20,12 +20,6 @@ package io.netty.handler.codec.spdy; */ public interface SpdyWindowUpdateFrame extends SpdyFrame { - /** - * @deprecated Use {@link #streamId()} instead. - */ - @Deprecated - int getStreamId(); - /** * Returns the Stream-ID of this frame. */ @@ -36,12 +30,6 @@ public interface SpdyWindowUpdateFrame extends SpdyFrame { */ SpdyWindowUpdateFrame setStreamId(int streamID); - /** - * @deprecated Use {@link #deltaWindowSize()} instead. - */ - @Deprecated - int getDeltaWindowSize(); - /** * Returns the Delta-Window-Size of this frame. */