From 95d8e782e392bbc1447cbbfa2b633386887b25c6 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 12 Jun 2012 20:31:45 +0900 Subject: [PATCH] ID -> Id (#393 Ensure all fields follow our naming convention) --- .../codec/spdy/DefaultSpdyGoAwayFrame.java | 40 +++++++++++-------- .../handler/codec/spdy/SpdyFrameEncoder.java | 2 +- .../handler/codec/spdy/SpdyGoAwayFrame.java | 16 +++++++- .../codec/spdy/SpdySessionHandlerTest.java | 2 +- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java b/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java index 0b6672ca03..416b878fe4 100644 --- a/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java +++ b/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java @@ -22,49 +22,57 @@ import org.jboss.netty.util.internal.StringUtil; */ public class DefaultSpdyGoAwayFrame implements SpdyGoAwayFrame { - private int lastGoodStreamID; + private int lastGoodStreamId; private SpdySessionStatus status; /** * Creates a new instance. * - * @param lastGoodStreamID the Last-good-stream-ID of this frame + * @param lastGoodStreamId the Last-good-stream-ID of this frame */ - public DefaultSpdyGoAwayFrame(int lastGoodStreamID) { - this(lastGoodStreamID, 0); + public DefaultSpdyGoAwayFrame(int lastGoodStreamId) { + this(lastGoodStreamId, 0); } /** * Creates a new instance. * - * @param lastGoodStreamID the Last-good-stream-ID of this frame + * @param lastGoodStreamId the Last-good-stream-ID of this frame * @param statusCode the Status code of this frame */ - public DefaultSpdyGoAwayFrame(int lastGoodStreamID, int statusCode) { - this(lastGoodStreamID, SpdySessionStatus.valueOf(statusCode)); + public DefaultSpdyGoAwayFrame(int lastGoodStreamId, int statusCode) { + this(lastGoodStreamId, SpdySessionStatus.valueOf(statusCode)); } /** * Creates a new instance. * - * @param lastGoodStreamID the Last-good-stream-ID of this frame + * @param lastGoodStreamId the Last-good-stream-ID of this frame * @param status the status of this frame */ - public DefaultSpdyGoAwayFrame(int lastGoodStreamID, SpdySessionStatus status) { - setLastGoodStreamID(lastGoodStreamID); + public DefaultSpdyGoAwayFrame(int lastGoodStreamId, SpdySessionStatus status) { + setLastGoodStreamId(lastGoodStreamId); setStatus(status); } public int getLastGoodStreamID() { - return lastGoodStreamID; + return getLastGoodStreamId(); } - public void setLastGoodStreamID(int lastGoodStreamID) { - if (lastGoodStreamID < 0) { + public int getLastGoodStreamId() { + return lastGoodStreamId; + } + + public void setLastGoodStreamID(int lastGoodStreamId) { + setLastGoodStreamId(lastGoodStreamId); + } + + public void setLastGoodStreamId(int lastGoodStreamId) { + if (lastGoodStreamId < 0) { throw new IllegalArgumentException("Last-good-stream-ID" - + " cannot be negative: " + lastGoodStreamID); + + " cannot be negative: " + lastGoodStreamId); } - this.lastGoodStreamID = lastGoodStreamID; + this.lastGoodStreamId = lastGoodStreamId; } public SpdySessionStatus getStatus() { @@ -81,7 +89,7 @@ public class DefaultSpdyGoAwayFrame implements SpdyGoAwayFrame { buf.append(getClass().getSimpleName()); buf.append(StringUtil.NEWLINE); buf.append("--> Last-good-stream-ID = "); - buf.append(lastGoodStreamID); + buf.append(lastGoodStreamId); buf.append(StringUtil.NEWLINE); buf.append("--> Status: "); buf.append(status.toString()); 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 eff3637ca0..053bf3f497 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 @@ -265,7 +265,7 @@ public class SpdyFrameEncoder extends OneToOneEncoder { frame.writeShort(version | 0x8000); frame.writeShort(SPDY_GOAWAY_FRAME); frame.writeInt(length); - frame.writeInt(spdyGoAwayFrame.getLastGoodStreamID()); + frame.writeInt(spdyGoAwayFrame.getLastGoodStreamId()); if (version >= 3) { frame.writeInt(spdyGoAwayFrame.getStatus().getCode()); } diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyGoAwayFrame.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyGoAwayFrame.java index 5900dfa00b..a6086e5acd 100644 --- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyGoAwayFrame.java +++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyGoAwayFrame.java @@ -20,16 +20,28 @@ package org.jboss.netty.handler.codec.spdy; */ public interface SpdyGoAwayFrame { + /** + * @deprecated Use {@link #getLastGoodStreamId()} instead. + */ + @Deprecated + int getLastGoodStreamID(); + /** * Returns the Last-good-stream-ID of this frame. */ - int getLastGoodStreamID(); + int getLastGoodStreamId(); + + /** + * @deprecated Use {@link #setLastGoodStreamId(int)} instead. + */ + @Deprecated + void setLastGoodStreamID(int lastGoodStreamId); /** * Sets the Last-good-stream-ID of this frame. The Last-good-stream-ID * cannot be negative. */ - void setLastGoodStreamID(int lastGoodStreamID); + void setLastGoodStreamId(int lastGoodStreamId); /** * Returns the status of this frame. diff --git a/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java b/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java index 182f52e0f8..331242a7d5 100644 --- a/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java @@ -86,7 +86,7 @@ public class SpdySessionHandlerTest { Assert.assertNotNull(msg); Assert.assertTrue(msg instanceof SpdyGoAwayFrame); SpdyGoAwayFrame spdyGoAwayFrame = (SpdyGoAwayFrame) msg; - Assert.assertTrue(spdyGoAwayFrame.getLastGoodStreamID() == lastGoodStreamID); + Assert.assertTrue(spdyGoAwayFrame.getLastGoodStreamId() == lastGoodStreamID); } private static void assertHeaders(Object msg, int streamID, SpdyHeaderBlock headers) {