diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java b/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java index 286f7bace4..525a0f00e6 100644 --- a/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java +++ b/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java @@ -36,6 +36,10 @@ public class DefaultSpdySettingsFrame implements SpdySettingsFrame { } public Set getIDs() { + return getIds(); + } + + public Set getIds() { return settingsMap.keySet(); } @@ -80,6 +84,10 @@ public class DefaultSpdySettingsFrame implements SpdySettingsFrame { } public boolean persistValue(int ID) { + return isPersistValue(ID); + } + + public boolean isPersistValue(int ID) { Integer key = new Integer(ID); if (settingsMap.containsKey(key)) { return settingsMap.get(key).getPersist(); diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameEncoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameEncoder.java index a1ec8995f4..5bacea4ba5 100644 --- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameEncoder.java @@ -201,7 +201,7 @@ public class SpdyFrameEncoder extends OneToOneEncoder { SpdySettingsFrame spdySettingsFrame = (SpdySettingsFrame) msg; byte flags = spdySettingsFrame.clearPreviouslyPersistedSettings() ? SPDY_SETTINGS_CLEAR : 0; - Set IDs = spdySettingsFrame.getIDs(); + Set IDs = spdySettingsFrame.getIds(); int numEntries = IDs.size(); int length = 4 + numEntries * 8; ChannelBuffer frame = ChannelBuffers.buffer( @@ -214,7 +214,7 @@ public class SpdyFrameEncoder extends OneToOneEncoder { for (Integer ID: IDs) { int id = ID.intValue(); byte ID_flags = (byte) 0; - if (spdySettingsFrame.persistValue(id)) { + if (spdySettingsFrame.isPersistValue(id)) { ID_flags |= SPDY_SETTINGS_PERSIST_VALUE; } if (spdySettingsFrame.isPersisted(id)) { diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySettingsFrame.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySettingsFrame.java index 6419d6a303..a95c03b78b 100644 --- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySettingsFrame.java +++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySettingsFrame.java @@ -31,11 +31,17 @@ public interface SpdySettingsFrame { int SETTINGS_INITIAL_WINDOW_SIZE = 7; int SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8; + /** + * @deprecated Use {@link #getIds()} instead. + */ + @Deprecated + Set getIDs(); + /** * Returns a {@code Set} of the setting IDs. * The set's iterator will return the IDs in ascending order. */ - Set getIDs(); + Set getIds(); /** * Returns {@code true} if the setting ID has a value. @@ -68,12 +74,18 @@ public interface SpdySettingsFrame { */ void removeValue(int ID); + /** + * @deprecated Use {@link #isPersistValue(int)} instead. + */ + @Deprecated + boolean persistValue(int ID); + /** * Returns {@code true} if this setting should be persisted. * Returns {@code false} if this setting should not be persisted * or if the setting ID has no value. */ - boolean persistValue(int ID); + boolean isPersistValue(int ID); /** * Sets if this setting should be persisted.