ID -> Id (#393 Ensure all fields follow our naming convention)

This commit is contained in:
Trustin Lee 2012-06-12 20:19:52 +09:00
parent a6f5af6116
commit d159a43a49
2 changed files with 60 additions and 21 deletions

View File

@ -23,8 +23,8 @@ import org.jboss.netty.util.internal.StringUtil;
public class DefaultSpdySynStreamFrame extends DefaultSpdyHeaderBlock
implements SpdySynStreamFrame {
private int streamID;
private int associatedToStreamID;
private int streamId;
private int associatedToStreamId;
private byte priority;
private boolean last;
private boolean unidirectional;
@ -38,35 +38,50 @@ public class DefaultSpdySynStreamFrame extends DefaultSpdyHeaderBlock
*/
public DefaultSpdySynStreamFrame(
int streamID, int associatedToStreamID, byte priority) {
super();
setStreamID(streamID);
setStreamId(streamID);
setAssociatedToStreamID(associatedToStreamID);
setPriority(priority);
}
public int getStreamID() {
return streamID;
return getStreamId();
}
public void setStreamID(int streamID) {
if (streamID <= 0) {
public int getStreamId() {
return streamId;
}
public void setStreamID(int streamId) {
setStreamId(streamId);
}
public void setStreamId(int streamId) {
if (streamId <= 0) {
throw new IllegalArgumentException(
"Stream-ID must be positive: " + streamID);
"Stream-ID must be positive: " + streamId);
}
this.streamID = streamID;
this.streamId = streamId;
}
public int getAssociatedToStreamID() {
return associatedToStreamID;
return getAssociatedToStreamId();
}
public void setAssociatedToStreamID(int associatedToStreamID) {
if (associatedToStreamID < 0) {
public int getAssociatedToStreamId() {
return associatedToStreamId;
}
public void setAssociatedToStreamID(int associatedToStreamId) {
setAssociatedToStreamId(associatedToStreamId);
}
public void setAssociatedToStreamId(int associatedToStreamId) {
if (associatedToStreamId < 0) {
throw new IllegalArgumentException(
"Associated-To-Stream-ID cannot be negative: " +
associatedToStreamID);
associatedToStreamId);
}
this.associatedToStreamID = associatedToStreamID;
this.associatedToStreamId = associatedToStreamId;
}
public byte getPriority() {
@ -108,11 +123,11 @@ public class DefaultSpdySynStreamFrame extends DefaultSpdyHeaderBlock
buf.append(')');
buf.append(StringUtil.NEWLINE);
buf.append("--> Stream-ID = ");
buf.append(streamID);
buf.append(streamId);
buf.append(StringUtil.NEWLINE);
if (associatedToStreamID != 0) {
if (associatedToStreamId != 0) {
buf.append("--> Associated-To-Stream-ID = ");
buf.append(associatedToStreamID);
buf.append(associatedToStreamId);
buf.append(StringUtil.NEWLINE);
}
buf.append("--> Priority = ");

View File

@ -20,26 +20,50 @@ package org.jboss.netty.handler.codec.spdy;
*/
public interface SpdySynStreamFrame extends SpdyHeaderBlock {
/**
* @deprecated Use {@link #getStreamId()} instead.
*/
@Deprecated
int getStreamID();
/**
* Returns the Stream-ID of this frame.
*/
int getStreamID();
int getStreamId();
/**
* @deprecated Use {@link #setStreamId(int)} instead.
*/
@Deprecated
void setStreamID(int streamID);
/**
* Sets the Stream-ID of this frame. The Stream-ID must be positive.
*/
void setStreamID(int streamID);
void setStreamId(int streamId);
/**
* @deprecated Use {@link #getAssociatedToStreamId()} instead.
*/
@Deprecated
int getAssociatedToStreamID();
/**
* Returns the Associated-To-Stream-ID of this frame.
*/
int getAssociatedToStreamID();
int getAssociatedToStreamId();
/**
* @deprecated Use {@link #setAssociatedToStreamId(int)} instead.
*/
@Deprecated
void setAssociatedToStreamID(int associatedToStreamID);
/**
* Sets the Associated-To-Stream-ID of this frame.
* The Associated-To-Stream-ID cannot be negative.
*/
void setAssociatedToStreamID(int associatedToStreamID);
void setAssociatedToStreamId(int associatedToStreamID);
/**
* Returns the priority of the stream.