Issue #34 opcode is now named consistently across the application.

menacher · menacher · commit da4f19f568b2 · 2012-12-30T12:56:52.000+05:30
diff --git a/example-games/src/test/java/org/menacheri/zombie/ZombieClient.java b/example-games/src/test/java/org/menacheri/zombie/ZombieClient.java
@@ -80,14 +80,14 @@ public void operationComplete(ChannelFuture future) throws Exception
 	
 	public static ChannelBuffer getLoginBuffer(String refKey, ChannelBuffer udpAddress)
 	{
-		ChannelBuffer opCode = ChannelBuffers.buffer(1);
+		ChannelBuffer opcode = ChannelBuffers.buffer(1);
 		ChannelBuffer protocol = ChannelBuffers.buffer(1);
-		opCode.writeByte(Events.LOG_IN);
+		opcode.writeByte(Events.LOG_IN);
 		protocol.writeByte(Events.PROTCOL_VERSION);
 		String username = "user";
 		String password = "pass";
 		// write username,password and ref key.
-		ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(opCode,protocol,
+		ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(opcode,protocol,
 				NettyUtils.writeStrings(username,password,refKey),udpAddress);
 		return buffer;
 	}
diff --git a/jetclient/src/main/java/org/menacheri/jetclient/handlers/netty/MessageBufferEventDecoder.java b/jetclient/src/main/java/org/menacheri/jetclient/handlers/netty/MessageBufferEventDecoder.java
@@ -1,41 +1,41 @@
-package org.menacheri.jetclient.handlers.netty;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import org.menacheri.jetclient.communication.NettyMessageBuffer;
-import org.menacheri.jetclient.event.Events;
-
-/**
- * This decoder will convert a Netty {@link ChannelBuffer} to a
- * {@link NettyMessageBuffer}. It will also convert
- * {@link Events#NETWORK_MESSAGE} events to {@link Events#SESSION_MESSAGE}
- * event.
- * 
- * @author Abraham Menacherry
- * 
- */
-@Sharable
-public class MessageBufferEventDecoder extends OneToOneDecoder
-{
-	
-	@Override
-	protected Object decode(ChannelHandlerContext ctx, Channel channel,
-			Object msg) throws Exception
-	{
-		if (null == msg)
-		{
-			return msg;
-		}
-		ChannelBuffer buffer = (ChannelBuffer) msg;
-		byte opCode = buffer.readByte();
-		if (opCode == Events.NETWORK_MESSAGE)
-		{
-			opCode = Events.SESSION_MESSAGE;
-		}
-		return Events.event(new NettyMessageBuffer(buffer), opCode);
-	}
-	
-}
+package org.menacheri.jetclient.handlers.netty;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandler.Sharable;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import org.menacheri.jetclient.communication.NettyMessageBuffer;
+import org.menacheri.jetclient.event.Events;
+
+/**
+ * This decoder will convert a Netty {@link ChannelBuffer} to a
+ * {@link NettyMessageBuffer}. It will also convert
+ * {@link Events#NETWORK_MESSAGE} events to {@link Events#SESSION_MESSAGE}
+ * event.
+ * 
+ * @author Abraham Menacherry
+ * 
+ */
+@Sharable
+public class MessageBufferEventDecoder extends OneToOneDecoder
+{
+	
+	@Override
+	protected Object decode(ChannelHandlerContext ctx, Channel channel,
+			Object msg) throws Exception
+	{
+		if (null == msg)
+		{
+			return msg;
+		}
+		ChannelBuffer buffer = (ChannelBuffer) msg;
+		byte opcode = buffer.readByte();
+		if (opcode == Events.NETWORK_MESSAGE)
+		{
+			opcode = Events.SESSION_MESSAGE;
+		}
+		return Events.event(new NettyMessageBuffer(buffer), opcode);
+	}
+	
+}
diff --git a/jetclient/src/main/java/org/menacheri/jetclient/handlers/netty/MessageBufferEventEncoder.java b/jetclient/src/main/java/org/menacheri/jetclient/handlers/netty/MessageBufferEventEncoder.java
@@ -32,14 +32,14 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,
 			return msg;
 		}
 		Event event = (Event) msg;
-		ChannelBuffer opCode = ChannelBuffers.buffer(1);
-		opCode.writeByte(event.getType());
+		ChannelBuffer opcode = ChannelBuffers.buffer(1);
+		opcode.writeByte(event.getType());
 		if (Events.LOG_IN == event.getType())
 		{
 			// write protocol version also
 			ChannelBuffer protocolVersion = ChannelBuffers.buffer(1);
 			protocolVersion.writeByte(Events.PROTOCOL_VERSION);
-			opCode = ChannelBuffers.wrappedBuffer(opCode, protocolVersion);
+			opcode = ChannelBuffers.wrappedBuffer(opcode, protocolVersion);
 		}
 		
 		ChannelBuffer buffer = null;
@@ -49,11 +49,11 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,
 			MessageBuffer<ChannelBuffer> msgBuffer = (MessageBuffer<ChannelBuffer>) event
 					.getSource();
 			ChannelBuffer data = msgBuffer.getNativeBuffer();
-			buffer = ChannelBuffers.wrappedBuffer(opCode, data);
+			buffer = ChannelBuffers.wrappedBuffer(opcode, data);
 		}
 		else
 		{
-			buffer = opCode;
+			buffer = opcode;
 		}
 		return buffer;
 	}
diff --git a/jetclient/src/main/java/org/menacheri/jetclient/util/NettyUtils.java b/jetclient/src/main/java/org/menacheri/jetclient/util/NettyUtils.java
@@ -42,10 +42,10 @@ public static void clearPipeline(ChannelPipeline pipeline)
 		}
 	}
 
-	public static ChannelBuffer createBufferForOpcode(int opCode)
+	public static ChannelBuffer createBufferForOpcode(int opcode)
 	{
 		ChannelBuffer buffer = ChannelBuffers.buffer(1);
-		buffer.writeByte(opCode);
+		buffer.writeByte(opcode);
 		return buffer;
 	}
 
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/app/GameEvent.java b/jetserver/src/main/java/org/menacheri/jetserver/app/GameEvent.java
@@ -15,7 +15,7 @@ public interface GameEvent<T,O,E> {
 	public PlayerSession getPlayerSession();
 	public void setPlayerSession(PlayerSession playerSession);
 	public O getOpCode();
-	public void setOpCode(O opCode);
+	public void setOpcode(O opcode);
 	public E getEventType();
 	public void setEventType(E eventType);
 	public String getEventName();
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/EventDecoder.java b/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/EventDecoder.java
@@ -25,11 +25,11 @@ protected Object decode(ChannelHandlerContext ctx, Channel channel,
 			return msg;
 		}
 		ChannelBuffer buffer = (ChannelBuffer)msg;
-		int opCode = buffer.readUnsignedByte();
-		if(Events.LOG_IN == opCode){
+		int opcode = buffer.readUnsignedByte();
+		if(Events.LOG_IN == opcode){
 			buffer.readUnsignedByte();// To read-destroy the protocol version byte.
 		}
-		return Events.event(buffer, opCode);
+		return Events.event(buffer, opcode);
 	}
 	
 }
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/EventEncoder.java b/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/EventEncoder.java
@@ -37,17 +37,17 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,
 			return msg;
 		}
 		Event event = (Event) msg;
-		ChannelBuffer opCode = ChannelBuffers.buffer(1);
-		opCode.writeByte(event.getType());
+		ChannelBuffer opcode = ChannelBuffers.buffer(1);
+		opcode.writeByte(event.getType());
 		ChannelBuffer buffer = null;
 		if(null != event.getSource())
 		{
 			ChannelBuffer data = (ChannelBuffer) event.getSource();
-			buffer = ChannelBuffers.wrappedBuffer(opCode, data);
+			buffer = ChannelBuffers.wrappedBuffer(opcode, data);
 		}
 		else
 		{
-			buffer = opCode;
+			buffer = opcode;
 		}
 		return buffer;
 	}
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/LoginProtocol.java b/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/LoginProtocol.java
@@ -107,10 +107,10 @@ public static class DefaultJetProtocol implements LoginProtocol
 		public boolean applyProtocol(ChannelBuffer buffer,
 				ChannelPipeline pipeline)
 		{
-			final int opCode = buffer.getUnsignedByte(buffer.readerIndex() + 2);
+			final int opcode = buffer.getUnsignedByte(buffer.readerIndex() + 2);
 			final int protocolVersion = buffer.getUnsignedByte(buffer
 					.readerIndex() + 3);
-			if (isJetProtocol(opCode, protocolVersion))
+			if (isJetProtocol(opcode, protocolVersion))
 			{
 				pipeline.addLast("framer", createLengthBasedFrameDecoder());
 				pipeline.addLast("eventDecoder", eventDecoder);
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/MessageBufferEventEncoder.java b/jetserver/src/main/java/org/menacheri/jetserver/handlers/netty/MessageBufferEventEncoder.java
@@ -1,48 +1,48 @@
-package org.menacheri.jetserver.handlers.netty;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
-import org.menacheri.jetserver.communication.MessageBuffer;
-import org.menacheri.jetserver.event.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-@Sharable
-public class MessageBufferEventEncoder extends OneToOneEncoder
-{
-	private static final Logger LOG = LoggerFactory
-	.getLogger(MessageBufferEventEncoder.class);
-	
-	@Override
-	protected Object encode(ChannelHandlerContext ctx, Channel channel,
-			Object msg) throws Exception
-	{
-		if (null == msg)
-		{
-			LOG.error("Null message received in MessageBufferEventEncoder");
-			return msg;
-		}
-		Event event = (Event) msg;
-		ChannelBuffer opCode = ChannelBuffers.buffer(1);
-		opCode.writeByte(event.getType());
-		ChannelBuffer buffer = null;
-		if(null != event.getSource())
-		{
-			@SuppressWarnings("unchecked")
-			MessageBuffer<ChannelBuffer> msgBuffer = (MessageBuffer<ChannelBuffer>)event.getSource();
-			ChannelBuffer data = msgBuffer.getNativeBuffer();
-			buffer = ChannelBuffers.wrappedBuffer(opCode, data);
-		}
-		else
-		{
-			buffer = opCode;
-		}
-		return buffer;
-	}
-
-}
+package org.menacheri.jetserver.handlers.netty;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelHandler.Sharable;
+import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import org.menacheri.jetserver.communication.MessageBuffer;
+import org.menacheri.jetserver.event.Event;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+@Sharable
+public class MessageBufferEventEncoder extends OneToOneEncoder
+{
+	private static final Logger LOG = LoggerFactory
+	.getLogger(MessageBufferEventEncoder.class);
+	
+	@Override
+	protected Object encode(ChannelHandlerContext ctx, Channel channel,
+			Object msg) throws Exception
+	{
+		if (null == msg)
+		{
+			LOG.error("Null message received in MessageBufferEventEncoder");
+			return msg;
+		}
+		Event event = (Event) msg;
+		ChannelBuffer opcode = ChannelBuffers.buffer(1);
+		opcode.writeByte(event.getType());
+		ChannelBuffer buffer = null;
+		if(null != event.getSource())
+		{
+			@SuppressWarnings("unchecked")
+			MessageBuffer<ChannelBuffer> msgBuffer = (MessageBuffer<ChannelBuffer>)event.getSource();
+			ChannelBuffer data = msgBuffer.getNativeBuffer();
+			buffer = ChannelBuffers.wrappedBuffer(opcode, data);
+		}
+		else
+		{
+			buffer = opcode;
+		}
+		return buffer;
+	}
+
+}
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/protocols/impl/AMF3Protocol.java b/jetserver/src/main/java/org/menacheri/jetserver/protocols/impl/AMF3Protocol.java
@@ -29,7 +29,7 @@ public class AMF3Protocol extends AbstractNettyProtocol
 {
 	/**
 	 * After the frame decoder retrieves the bytes from the incoming stream,
-	 * this decoder will convert it to an {@link Event} with the opCode set as
+	 * this decoder will convert it to an {@link Event} with the opcode set as
 	 * the first byte read from the buffer. And the source object of the event
 	 * created will have the rest of the {@link ChannelBuffer}.
 	 */
diff --git a/jetserver/src/main/java/org/menacheri/jetserver/util/NettyUtils.java b/jetserver/src/main/java/org/menacheri/jetserver/util/NettyUtils.java
@@ -74,10 +74,10 @@ public static void clearPipeline(ChannelPipeline pipeline)
 		}
 	}
 	
-	public static ChannelBuffer createBufferForOpcode(int opCode)
+	public static ChannelBuffer createBufferForOpcode(int opcode)
 	{
 		ChannelBuffer buffer = ChannelBuffers.buffer(1);
-		buffer.writeByte(opCode);
+		buffer.writeByte(opcode);
 		return buffer;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,`
`32`	`32`	`return msg;`
`33`	`33`	`}`
`34`	`34`	`Event event = (Event) msg;`
`35`		`- ChannelBuffer opCode = ChannelBuffers.buffer(1);`
`36`		`- opCode.writeByte(event.getType());`
	`35`	`+ ChannelBuffer opcode = ChannelBuffers.buffer(1);`
	`36`	`+ opcode.writeByte(event.getType());`
`37`	`37`	`if (Events.LOG_IN == event.getType())`
`38`	`38`	`{`
`39`	`39`	`// write protocol version also`
`40`	`40`	`ChannelBuffer protocolVersion = ChannelBuffers.buffer(1);`
`41`	`41`	`protocolVersion.writeByte(Events.PROTOCOL_VERSION);`
`42`		`- opCode = ChannelBuffers.wrappedBuffer(opCode, protocolVersion);`
	`42`	`+ opcode = ChannelBuffers.wrappedBuffer(opcode, protocolVersion);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`ChannelBuffer buffer = null;`
`@@ -49,11 +49,11 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,`
`49`	`49`	`MessageBuffer<ChannelBuffer> msgBuffer = (MessageBuffer<ChannelBuffer>) event`
`50`	`50`	`.getSource();`
`51`	`51`	`ChannelBuffer data = msgBuffer.getNativeBuffer();`
`52`		`- buffer = ChannelBuffers.wrappedBuffer(opCode, data);`
	`52`	`+ buffer = ChannelBuffers.wrappedBuffer(opcode, data);`
`53`	`53`	`}`
`54`	`54`	`else`
`55`	`55`	`{`
`56`		`- buffer = opCode;`
	`56`	`+ buffer = opcode;`
`57`	`57`	`}`
`58`	`58`	`return buffer;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@ public static void clearPipeline(ChannelPipeline pipeline)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- public static ChannelBuffer createBufferForOpcode(int opCode)`
	`45`	`+ public static ChannelBuffer createBufferForOpcode(int opcode)`
`46`	`46`	`{`
`47`	`47`	`ChannelBuffer buffer = ChannelBuffers.buffer(1);`
`48`		`- buffer.writeByte(opCode);`
	`48`	`+ buffer.writeByte(opcode);`
`49`	`49`	`return buffer;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ protected Object decode(ChannelHandlerContext ctx, Channel channel,`
`25`	`25`	`return msg;`
`26`	`26`	`}`
`27`	`27`	`ChannelBuffer buffer = (ChannelBuffer)msg;`
`28`		`- int opCode = buffer.readUnsignedByte();`
`29`		`- if(Events.LOG_IN == opCode){`
	`28`	`+ int opcode = buffer.readUnsignedByte();`
	`29`	`+ if(Events.LOG_IN == opcode){`
`30`	`30`	`buffer.readUnsignedByte();// To read-destroy the protocol version byte.`
`31`	`31`	`}`
`32`		`- return Events.event(buffer, opCode);`
	`32`	`+ return Events.event(buffer, opcode);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,17 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,`
`37`	`37`	`return msg;`
`38`	`38`	`}`
`39`	`39`	`Event event = (Event) msg;`
`40`		`- ChannelBuffer opCode = ChannelBuffers.buffer(1);`
`41`		`- opCode.writeByte(event.getType());`
	`40`	`+ ChannelBuffer opcode = ChannelBuffers.buffer(1);`
	`41`	`+ opcode.writeByte(event.getType());`
`42`	`42`	`ChannelBuffer buffer = null;`
`43`	`43`	`if(null != event.getSource())`
`44`	`44`	`{`
`45`	`45`	`ChannelBuffer data = (ChannelBuffer) event.getSource();`
`46`		`- buffer = ChannelBuffers.wrappedBuffer(opCode, data);`
	`46`	`+ buffer = ChannelBuffers.wrappedBuffer(opcode, data);`
`47`	`47`	`}`
`48`	`48`	`else`
`49`	`49`	`{`
`50`		`- buffer = opCode;`
	`50`	`+ buffer = opcode;`
`51`	`51`	`}`
`52`	`52`	`return buffer;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,10 @@ public static class DefaultJetProtocol implements LoginProtocol`
`107`	`107`	`public boolean applyProtocol(ChannelBuffer buffer,`
`108`	`108`	`ChannelPipeline pipeline)`
`109`	`109`	`{`
`110`		`- final int opCode = buffer.getUnsignedByte(buffer.readerIndex() + 2);`
	`110`	`+ final int opcode = buffer.getUnsignedByte(buffer.readerIndex() + 2);`
`111`	`111`	`final int protocolVersion = buffer.getUnsignedByte(buffer`
`112`	`112`	`.readerIndex() + 3);`
`113`		`- if (isJetProtocol(opCode, protocolVersion))`
	`113`	`+ if (isJetProtocol(opcode, protocolVersion))`
`114`	`114`	`{`
`115`	`115`	`pipeline.addLast("framer", createLengthBasedFrameDecoder());`
`116`	`116`	`pipeline.addLast("eventDecoder", eventDecoder);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class AMF3Protocol extends AbstractNettyProtocol`
`29`	`29`	`{`
`30`	`30`	`/**`
`31`	`31`	`* After the frame decoder retrieves the bytes from the incoming stream,`
`32`		`- * this decoder will convert it to an {@link Event} with the opCode set as`
	`32`	`+ * this decoder will convert it to an {@link Event} with the opcode set as`
`33`	`33`	`* the first byte read from the buffer. And the source object of the event`
`34`	`34`	`* created will have the rest of the {@link ChannelBuffer}.`
`35`	`35`	`*/`