zdm
/
java-nio-server
Archived
3
Fork 0
Code Issues Pull Requests Releases 1 Activity

Reformatted classes, added Javadoc headers

This commit is contained in:
Kai S. K. Engelbart 2019-12-28 11:43:48 +02:00
parent 7e3a23e093
commit 58c8e0d98b
21 changed files with 922 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/jenkov/nioserver/IMessageProcessor.java
View File

@ -1,10 +1,13 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
/** /**
* Created by jjenkov on 16-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpUtilTest.java</strong><br>
* Created: <strong>16 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public interface IMessageProcessor { public interface IMessageProcessor {
public void process(Message message, WriteProxy writeProxy); public void process(Message message, WriteProxy writeProxy);
}
}

17
src/main/java/com/jenkov/nioserver/IMessageReader.java
View File

@ -5,16 +5,17 @@ import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
/** /**
* Created by jjenkov on 16-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpUtilTest.java</strong><br>
* Created: <strong>16 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public interface IMessageReader { public interface IMessageReader {
public void init(MessageBuffer readMessageBuffer); public void init(MessageBuffer readMessageBuffer);
public void read(Socket socket, ByteBuffer byteBuffer) throws IOException; public void read(Socket socket, ByteBuffer byteBuffer) throws IOException;
public List<Message> getMessages(); public List<Message> getMessages();
}
}

11
src/main/java/com/jenkov/nioserver/IMessageReaderFactory.java
View File

@ -1,10 +1,13 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
/** /**
* Created by jjenkov on 16-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpUtilTest.java</strong><br>
* Created: <strong>16 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public interface IMessageReaderFactory { public interface IMessageReaderFactory {
public IMessageReader createMessageReader(); public IMessageReader createMessageReader();
}
}

153
src/main/java/com/jenkov/nioserver/Message.java
View File

@ -3,103 +3,92 @@ package com.jenkov.nioserver;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** /**
* Created by jjenkov on 16-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpUtilTest.java</strong><br>
* Created: <strong>16 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class Message { public class Message {
private MessageBuffer messageBuffer = null; private MessageBuffer messageBuffer;
public long socketId = 0; // the id of source socket or destination socket, depending on whether is going in or out. public long socketId; // the id of source socket or destination socket, depending on whether is going
// in or out.
public byte[] sharedArray = null; public byte[] sharedArray;
public int offset = 0; //offset into sharedArray where this message data starts. public int offset; // offset into sharedArray where this message data starts.
public int capacity = 0; //the size of the section in the sharedArray allocated to this message. public int capacity; // the size of the section in the sharedArray allocated to this message.
public int length = 0; //the number of bytes used of the allocated section. public int length; // the number of bytes used of the allocated section.
public Object metaData = null; public Object metaData;
public Message(MessageBuffer messageBuffer) { public Message(MessageBuffer messageBuffer) { this.messageBuffer = messageBuffer; }
this.messageBuffer = messageBuffer;
}
/** /**
* Writes data from the ByteBuffer into this message - meaning into the buffer backing this message. * Writes data from the ByteBuffer into this message - meaning into the buffer
* * backing this message.
* @param byteBuffer The ByteBuffer containing the message data to write. *
* @return * @param byteBuffer The ByteBuffer containing the message data to write.
*/ * @return
public int writeToMessage(ByteBuffer byteBuffer){ */
int remaining = byteBuffer.remaining(); public int writeToMessage(ByteBuffer byteBuffer) {
int remaining = byteBuffer.remaining();
while(this.length + remaining > capacity){ while (this.length + remaining > capacity)
if(!this.messageBuffer.expandMessage(this)) { if (!this.messageBuffer.expandMessage(this)) return -1;
return -1;
}
}
int bytesToCopy = Math.min(remaining, this.capacity - this.length); int bytesToCopy = Math.min(remaining, capacity - length);
byteBuffer.get(this.sharedArray, this.offset + this.length, bytesToCopy); byteBuffer.get(sharedArray, offset + length, bytesToCopy);
this.length += bytesToCopy; length += bytesToCopy;
return bytesToCopy; return bytesToCopy;
} }
/**
* Writes data from the byte array into this message - meaning into the buffer
* backing this message.
*
* @param byteArray The byte array containing the message data to write.
* @return
*/
public int writeToMessage(byte[] byteArray) { return writeToMessage(byteArray, 0, byteArray.length); }
/**
* Writes data from the byte array into this message - meaning into the buffer
* backing this message.
*
* @param byteArray The byte array containing the message data to write.
* @return
*/
public int writeToMessage(byte[] byteArray, int offset, int length) {
int remaining = length;
while (this.length + remaining > capacity)
if (!this.messageBuffer.expandMessage(this)) return -1;
/** int bytesToCopy = Math.min(remaining, capacity - length);
* Writes data from the byte array into this message - meaning into the buffer backing this message. System.arraycopy(byteArray, offset, sharedArray, offset + this.length, bytesToCopy);
* this.length += bytesToCopy;
* @param byteArray The byte array containing the message data to write. return bytesToCopy;
* @return }
*/
public int writeToMessage(byte[] byteArray){
return writeToMessage(byteArray, 0, byteArray.length);
}
/**
* In case the buffer backing the nextMessage contains more than one HTTP
* message, move all data after the first
* message to a new Message object.
*
* @param message The message containing the partial message (after the first
* message).
* @param endIndex The end index of the first message in the buffer of the
* message given as parameter.
*/
public void writePartialMessageToMessage(Message message, int endIndex) {
int startIndexOfPartialMessage = message.offset + endIndex;
int lengthOfPartialMessage = message.offset + message.length - endIndex;
/** System.arraycopy(message.sharedArray, startIndexOfPartialMessage, sharedArray, offset, lengthOfPartialMessage);
* Writes data from the byte array into this message - meaning into the buffer backing this message. }
*
* @param byteArray The byte array containing the message data to write.
* @return
*/
public int writeToMessage(byte[] byteArray, int offset, int length){
int remaining = length;
while(this.length + remaining > capacity){ public int writeToByteBuffer(ByteBuffer byteBuffer) { return 0; }
if(!this.messageBuffer.expandMessage(this)) { }
return -1;
}
}
int bytesToCopy = Math.min(remaining, this.capacity - this.length);
System.arraycopy(byteArray, offset, this.sharedArray, this.offset + this.length, bytesToCopy);
this.length += bytesToCopy;
return bytesToCopy;
}
/**
* In case the buffer backing the nextMessage contains more than one HTTP message, move all data after the first
* message to a new Message object.
*
* @param message The message containing the partial message (after the first message).
* @param endIndex The end index of the first message in the buffer of the message given as parameter.
*/
public void writePartialMessageToMessage(Message message, int endIndex){
int startIndexOfPartialMessage = message.offset + endIndex;
int lengthOfPartialMessage = (message.offset + message.length) - endIndex;
System.arraycopy(message.sharedArray, startIndexOfPartialMessage, this.sharedArray, this.offset, lengthOfPartialMessage);
}
public int writeToByteBuffer(ByteBuffer byteBuffer){
return 0;
}
}

127
src/main/java/com/jenkov/nioserver/MessageBuffer.java
View File

@ -1,88 +1,83 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
/** /**
* A shared buffer which can contain many messages inside. A message gets a section of the buffer to use. If the * A shared buffer which can contain many messages inside. A message gets a
* message outgrows the section in size, the message requests a larger section and the message is copied to that * section of the buffer to use. If the message outgrows the section in size,
* larger section. The smaller section is then freed again. * the message requests a larger section and the message is copied to that
* larger section. The smaller section is then freed again.<br>
* <br>
* Project: <strong>java-nio-server</strong><br>
* File: <strong>MessageBuffer.java</strong><br>
* Created: <strong>18 Oct 2015</strong><br>
* *
* * @author jjenkov
* Created by jjenkov on 18-10-2015.
*/ */
public class MessageBuffer { public class MessageBuffer {
public static int KB = 1024; public static int KB = 1024;
public static int MB = 1024 * KB; public static int MB = 1024 * KB;
private static final int CAPACITY_SMALL = 4 * KB; private static final int CAPACITY_SMALL = 4 * KB;
private static final int CAPACITY_MEDIUM = 128 * KB; private static final int CAPACITY_MEDIUM = 128 * KB;
private static final int CAPACITY_LARGE = 1024 * KB; private static final int CAPACITY_LARGE = 1 * MB;
//package scope (default) - so they can be accessed from unit tests. // package scope (default) - so they can be accessed from unit tests.
byte[] smallMessageBuffer = new byte[1024 * 4 * KB]; //1024 x 4KB messages = 4MB. byte[] smallMessageBuffer = new byte[1024 * 4 * KB]; // 1024 x 4KB messages = 4MB.
byte[] mediumMessageBuffer = new byte[128 * 128 * KB]; // 128 x 128KB messages = 16MB. byte[] mediumMessageBuffer = new byte[128 * 128 * KB]; // 128 x 128KB messages = 16MB.
byte[] largeMessageBuffer = new byte[16 * 1 * MB]; // 16 * 1MB messages = 16MB. byte[] largeMessageBuffer = new byte[16 * 1 * MB]; // 16 * 1MB messages = 16MB.
QueueIntFlip smallMessageBufferFreeBlocks = new QueueIntFlip(1024); // 1024 free sections QueueIntFlip smallMessageBufferFreeBlocks = new QueueIntFlip(1024); // 1024 free sections
QueueIntFlip mediumMessageBufferFreeBlocks = new QueueIntFlip(128); // 128 free sections QueueIntFlip mediumMessageBufferFreeBlocks = new QueueIntFlip(128); // 128 free sections
QueueIntFlip largeMessageBufferFreeBlocks = new QueueIntFlip(16); // 16 free sections QueueIntFlip largeMessageBufferFreeBlocks = new QueueIntFlip(16); // 16 free sections
//todo make all message buffer capacities and block sizes configurable // TODO: make all message buffer capacities and block sizes configurable
//todo calculate free block queue sizes based on capacity and block size of buffers. // TODO: calculate free block queue sizes based on capacity and block size of
// buffers.
public MessageBuffer() { public MessageBuffer() {
//add all free sections to all free section queues. // add all free sections to all free section queues.
for(int i=0; i<smallMessageBuffer.length; i+= CAPACITY_SMALL){ for (int i = 0; i < smallMessageBuffer.length; i += CAPACITY_SMALL)
this.smallMessageBufferFreeBlocks.put(i); smallMessageBufferFreeBlocks.put(i);
} for (int i = 0; i < mediumMessageBuffer.length; i += CAPACITY_MEDIUM)
for(int i=0; i<mediumMessageBuffer.length; i+= CAPACITY_MEDIUM){ mediumMessageBufferFreeBlocks.put(i);
this.mediumMessageBufferFreeBlocks.put(i); for (int i = 0; i < largeMessageBuffer.length; i += CAPACITY_LARGE)
} largeMessageBufferFreeBlocks.put(i);
for(int i=0; i<largeMessageBuffer.length; i+= CAPACITY_LARGE){ }
this.largeMessageBufferFreeBlocks.put(i);
}
}
public Message getMessage() { public Message getMessage() {
int nextFreeSmallBlock = this.smallMessageBufferFreeBlocks.take(); int nextFreeSmallBlock = this.smallMessageBufferFreeBlocks.take();
if(nextFreeSmallBlock == -1) return null; if (nextFreeSmallBlock == -1) return null;
Message message = new Message(this); //todo get from Message pool - caps memory usage. Message message = new Message(this); // TODO: get from Message pool - caps memory usage.
message.sharedArray = this.smallMessageBuffer; message.sharedArray = this.smallMessageBuffer;
message.capacity = CAPACITY_SMALL; message.capacity = CAPACITY_SMALL;
message.offset = nextFreeSmallBlock; message.offset = nextFreeSmallBlock;
message.length = 0; message.length = 0;
return message; return message;
} }
public boolean expandMessage(Message message){ public boolean expandMessage(Message message) {
if(message.capacity == CAPACITY_SMALL){ if (message.capacity == CAPACITY_SMALL)
return moveMessage(message, this.smallMessageBufferFreeBlocks, this.mediumMessageBufferFreeBlocks, this.mediumMessageBuffer, CAPACITY_MEDIUM); return moveMessage(message, smallMessageBufferFreeBlocks, mediumMessageBufferFreeBlocks, mediumMessageBuffer, CAPACITY_MEDIUM);
} else if(message.capacity == CAPACITY_MEDIUM){ else if (message.capacity == CAPACITY_MEDIUM)
return moveMessage(message, this.mediumMessageBufferFreeBlocks, this.largeMessageBufferFreeBlocks, this.largeMessageBuffer, CAPACITY_LARGE); return moveMessage(message, mediumMessageBufferFreeBlocks, largeMessageBufferFreeBlocks, largeMessageBuffer, CAPACITY_LARGE);
} else { else return false;
return false; }
}
}
private boolean moveMessage(Message message, QueueIntFlip srcBlockQueue, QueueIntFlip destBlockQueue, byte[] dest, int newCapacity) { private boolean moveMessage(Message message, QueueIntFlip srcBlockQueue, QueueIntFlip destBlockQueue, byte[] dest, int newCapacity) {
int nextFreeBlock = destBlockQueue.take(); int nextFreeBlock = destBlockQueue.take();
if(nextFreeBlock == -1) return false; if (nextFreeBlock == -1) return false;
System.arraycopy(message.sharedArray, message.offset, dest, nextFreeBlock, message.length); System.arraycopy(message.sharedArray, message.offset, dest, nextFreeBlock, message.length);
srcBlockQueue.put(message.offset); //free smaller block after copy srcBlockQueue.put(message.offset); // free smaller block after copy
message.sharedArray = dest; message.sharedArray = dest;
message.offset = nextFreeBlock; message.offset = nextFreeBlock;
message.capacity = newCapacity; message.capacity = newCapacity;
return true; return true;
} }
}
}

58
src/main/java/com/jenkov/nioserver/MessageWriter.java
View File

@ -6,44 +6,36 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* Created by jjenkov on 21-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>MessageWriter.java</strong><br>
* Created: <strong>21 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class MessageWriter { public class MessageWriter {
private List<Message> writeQueue = new ArrayList<>(); private List<Message> writeQueue = new ArrayList<>();
private Message messageInProgress = null; private Message messageInProgress;
private int bytesWritten = 0; private int bytesWritten;
public MessageWriter() { public void enqueue(Message message) {
} if (messageInProgress == null) messageInProgress = message;
else writeQueue.add(message);
}
public void enqueue(Message message) { public void write(Socket socket, ByteBuffer byteBuffer) throws IOException {
if(this.messageInProgress == null){ byteBuffer.put(messageInProgress.sharedArray, messageInProgress.offset + bytesWritten, messageInProgress.length - bytesWritten);
this.messageInProgress = message; byteBuffer.flip();
} else {
this.writeQueue.add(message);
}
}
public void write(Socket socket, ByteBuffer byteBuffer) throws IOException { bytesWritten += socket.write(byteBuffer);
byteBuffer.put(this.messageInProgress.sharedArray, this.messageInProgress.offset + this.bytesWritten, this.messageInProgress.length - this.bytesWritten); byteBuffer.clear();
byteBuffer.flip();
this.bytesWritten += socket.write(byteBuffer); if (bytesWritten >= messageInProgress.length) {
byteBuffer.clear(); if (writeQueue.size() > 0) messageInProgress = writeQueue.remove(0);
else messageInProgress = null;
// TODO: unregister from selector
}
}
if(bytesWritten >= this.messageInProgress.length){ public boolean isEmpty() { return writeQueue.isEmpty() && messageInProgress == null; }
if(this.writeQueue.size() > 0){ }
this.messageInProgress = this.writeQueue.remove(0);
} else {
this.messageInProgress = null;
//todo unregister from selector
}
}
}
public boolean isEmpty() {
return this.writeQueue.isEmpty() && this.messageInProgress == null;
}
}

278
src/main/java/com/jenkov/nioserver/QueueIntFlip.java
View File

@ -1,186 +1,158 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
/** /**
* Same as QueueFillCount, except that QueueFlip uses a flip flag to keep track of when the internal writePos has * Same as QueueFillCount, except that QueueFlip uses a flip flag to keep track
* "overflowed" (meaning it goes back to 0). Other than that, the two implementations are very similar in functionality. * of when the internal writePos has "overflowed" (meaning it goes back to 0).
* Other than that, the two implementations are very similar in
* functionality.<br>
* <br>
* One additional difference is that QueueFlip has an available() method, where
* this is a public variable in QueueFillCount.<br>
* <br>
* Project: <strong>java-nio-server</strong><br>
* File: <strong>QueueIntFlip.java</strong><br>
* Created: <strong>18 Oct 2015</strong><br>
* *
* One additional difference is that QueueFlip has an available() method, where this is a public variable in * @author jjenkov
* QueueFillCount.
*
* Created by jjenkov on 18-09-2015.
*/ */
public class QueueIntFlip { public class QueueIntFlip {
public int[] elements = null; public int[] elements;
public int capacity = 0; public int capacity;
public int writePos = 0; public int writePos;
public int readPos = 0; public int readPos;
public boolean flipped = false; public boolean flipped;
public QueueIntFlip(int capacity) { public QueueIntFlip(int capacity) {
this.capacity = capacity; this.capacity = capacity;
this.elements = new int[capacity]; //todo get from TypeAllocator ? elements = new int[capacity]; // TODO: get from TypeAllocator ?
} }
public void reset() { public void reset() {
this.writePos = 0; writePos = 0;
this.readPos = 0; readPos = 0;
this.flipped = false; flipped = false;
} }
public int available() { public int available() { return flipped ? capacity - readPos + writePos : writePos - readPos; }
if(!flipped){
return writePos - readPos;
}
return capacity - readPos + writePos;
}
public int remainingCapacity() { public int remainingCapacity() { return flipped ? readPos - writePos : capacity - writePos; }
if(!flipped){
return capacity - writePos;
}
return readPos - writePos;
}
public boolean put(int element){ public boolean put(int element) {
if(!flipped){ if (!flipped) {
if(writePos == capacity){ if (writePos == capacity) {
writePos = 0; writePos = 0;
flipped = true; flipped = true;
if(writePos < readPos){ if (writePos < readPos) {
elements[writePos++] = element; elements[writePos++] = element;
return true; return true;
} else { } else return false;
return false; } else {
} elements[writePos++] = element;
} else { return true;
elements[writePos++] = element; }
return true; } else {
} if (writePos < readPos) {
} else { elements[writePos++] = element;
if(writePos < readPos ){ return true;
elements[writePos++] = element; } else return false;
return true; }
} else { }
return false;
}
}
}
public int put(int[] newElements, int length){ public int put(int[] newElements, int length) {
int newElementsReadPos = 0; int newElementsReadPos = 0;
if(!flipped){ if (!flipped) {
//readPos lower than writePos - free sections are: // readPos lower than writePos - free sections are:
//1) from writePos to capacity // 1) from writePos to capacity
//2) from 0 to readPos // 2) from 0 to readPos
if(length <= capacity - writePos){ if (length <= capacity - writePos) {
//new elements fit into top of elements array - copy directly // new elements fit into top of elements array - copy directly
for(; newElementsReadPos < length; newElementsReadPos++){ for (; newElementsReadPos < length; newElementsReadPos++)
this.elements[this.writePos++] = newElements[newElementsReadPos]; elements[writePos++] = newElements[newElementsReadPos];
}
return newElementsReadPos; return newElementsReadPos;
} else { } else {
//new elements must be divided between top and bottom of elements array // new elements must be divided between top and bottom of elements array
//writing to top // writing to top
for(;this.writePos < capacity; this.writePos++){ for (; writePos < capacity; writePos++)
this.elements[this.writePos] = newElements[newElementsReadPos++]; elements[writePos] = newElements[newElementsReadPos++];
}
//writing to bottom // writing to bottom
this.writePos = 0; this.writePos = 0;
this.flipped = true; this.flipped = true;
int endPos = Math.min(this.readPos, length - newElementsReadPos); int endPos = Math.min(readPos, length - newElementsReadPos);
for(; this.writePos < endPos; this.writePos++){ for (; writePos < endPos; writePos++)
this.elements[writePos] = newElements[newElementsReadPos++]; this.elements[writePos] = newElements[newElementsReadPos++];
}
return newElementsReadPos;
}
return newElementsReadPos; } else {
} // readPos higher than writePos - free sections are:
// 1) from writePos to readPos
} else { int endPos = Math.min(readPos, writePos + length);
//readPos higher than writePos - free sections are:
//1) from writePos to readPos
int endPos = Math.min(this.readPos, this.writePos + length); for (; writePos < endPos; writePos++)
elements[writePos] = newElements[newElementsReadPos++];
for(; this.writePos < endPos; this.writePos++){ return newElementsReadPos;
this.elements[this.writePos] = newElements[newElementsReadPos++]; }
} }
return newElementsReadPos; public int take() {
} if (!flipped) return readPos < writePos ? elements[readPos++] : -1;
} else {
if (readPos == capacity) {
readPos = 0;
flipped = false;
return readPos < writePos ? elements[readPos++] : -1;
} else return elements[readPos++];
}
}
public int take() { public int take(int[] into, int length) {
if(!flipped){ int intoWritePos = 0;
if(readPos < writePos){ if (!flipped) {
return elements[readPos++]; // writePos higher than readPos - available section is writePos - readPos
} else {
return -1;
}
} else {
if(readPos == capacity){
readPos = 0;
flipped = false;
if(readPos < writePos){ int endPos = Math.min(writePos, readPos + length);
return elements[readPos++]; for (; readPos < endPos; readPos++)
} else { into[intoWritePos++] = elements[readPos];
return -1; return intoWritePos;
} } else {
} else { // readPos higher than writePos - available sections are top + bottom of
return elements[readPos++]; // elements array
}
}
}
public int take(int[] into, int length){ if (length <= capacity - readPos) {
int intoWritePos = 0; // length is lower than the elements available at the top of the elements array
if(!flipped){ // - copy directly
//writePos higher than readPos - available section is writePos - readPos for (; intoWritePos < length; intoWritePos++)
into[intoWritePos] = elements[readPos++];
int endPos = Math.min(this.writePos, this.readPos + length); return intoWritePos;
for(; this.readPos < endPos; this.readPos++){ } else {
into[intoWritePos++] = this.elements[this.readPos]; // length is higher than elements available at the top of the elements array
} // split copy into a copy from both top and bottom of elements array.
return intoWritePos;
} else {
//readPos higher than writePos - available sections are top + bottom of elements array
if(length <= capacity - readPos){ // copy from top
//length is lower than the elements available at the top of the elements array - copy directly for (; readPos < capacity; readPos++)
for(; intoWritePos < length; intoWritePos++){ into[intoWritePos++] = elements[readPos];
into[intoWritePos] = this.elements[this.readPos++];
}
return intoWritePos; // copy from bottom
} else { readPos = 0;
//length is higher than elements available at the top of the elements array flipped = false;
//split copy into a copy from both top and bottom of elements array. int endPos = Math.min(writePos, length - intoWritePos);
for (; readPos < endPos; readPos++)
into[intoWritePos++] = elements[readPos];
//copy from top return intoWritePos;
for(; this.readPos < capacity; this.readPos++){ }
into[intoWritePos++] = this.elements[this.readPos]; }
} }
}
//copy from bottom
this.readPos = 0;
this.flipped = false;
int endPos = Math.min(this.writePos, length - intoWritePos);
for(; this.readPos < endPos; this.readPos++){
into[intoWritePos++] = this.elements[this.readPos];
}
return intoWritePos;
}
}
}
}

54
src/main/java/com/jenkov/nioserver/Server.java
View File

@ -3,44 +3,44 @@ package com.jenkov.nioserver;
import java.io.IOException; import java.io.IOException;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
/** /**
* Created by jjenkov on 24-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>Server.java</strong><br>
* Created: <strong>24 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class Server { public class Server {
private SocketAccepter socketAccepter = null; private SocketAcceptor socketAccepter;
private SocketProcessor socketProcessor = null; private SocketProcessor socketProcessor;
private int tcpPort = 0; private int tcpPort;
private IMessageReaderFactory messageReaderFactory = null; private IMessageReaderFactory messageReaderFactory;
private IMessageProcessor messageProcessor = null; private IMessageProcessor messageProcessor;
public Server(int tcpPort, IMessageReaderFactory messageReaderFactory, IMessageProcessor messageProcessor) { public Server(int tcpPort, IMessageReaderFactory messageReaderFactory, IMessageProcessor messageProcessor) {
this.tcpPort = tcpPort; this.tcpPort = tcpPort;
this.messageReaderFactory = messageReaderFactory; this.messageReaderFactory = messageReaderFactory;
this.messageProcessor = messageProcessor; this.messageProcessor = messageProcessor;
} }
public void start() throws IOException { public void start() throws IOException {
Queue socketQueue = new ArrayBlockingQueue(1024); //move 1024 to ServerConfig Queue<Socket> socketQueue = new ArrayBlockingQueue<>(1024); // TODO: move 1024 to ServerConfig
this.socketAccepter = new SocketAccepter(tcpPort, socketQueue); socketAccepter = new SocketAcceptor(tcpPort, socketQueue);
MessageBuffer readBuffer = new MessageBuffer();
MessageBuffer writeBuffer = new MessageBuffer();
MessageBuffer readBuffer = new MessageBuffer(); socketProcessor = new SocketProcessor(socketQueue, readBuffer, writeBuffer, this.messageReaderFactory, this.messageProcessor);
MessageBuffer writeBuffer = new MessageBuffer();
this.socketProcessor = new SocketProcessor(socketQueue, readBuffer, writeBuffer, this.messageReaderFactory, this.messageProcessor); Thread accepterThread = new Thread(socketAccepter);
Thread processorThread = new Thread(socketProcessor);
Thread accepterThread = new Thread(this.socketAccepter); accepterThread.start();
Thread processorThread = new Thread(this.socketProcessor); processorThread.start();
}
accepterThread.start(); }
processorThread.start();
}
}

64
src/main/java/com/jenkov/nioserver/Socket.java
View File

@ -5,51 +5,47 @@ import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
/** /**
* Created by jjenkov on 16-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>Socket.java</strong><br>
* Created: <strong>16 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class Socket { public class Socket {
public long socketId; public long socketId;
public SocketChannel socketChannel = null; public SocketChannel socketChannel;
public IMessageReader messageReader = null; public IMessageReader messageReader;
public MessageWriter messageWriter = null; public MessageWriter messageWriter;
public boolean endOfStreamReached = false; public boolean endOfStreamReached;
public Socket() { public Socket(SocketChannel socketChannel) { this.socketChannel = socketChannel; }
}
public Socket(SocketChannel socketChannel) { public int read(ByteBuffer byteBuffer) throws IOException {
this.socketChannel = socketChannel; int bytesRead = socketChannel.read(byteBuffer);
} int totalBytesRead = bytesRead;
public int read(ByteBuffer byteBuffer) throws IOException { while (bytesRead > 0) {
int bytesRead = this.socketChannel.read(byteBuffer); bytesRead = socketChannel.read(byteBuffer);
int totalBytesRead = bytesRead; totalBytesRead += bytesRead;
}
if (bytesRead == -1) endOfStreamReached = true;
while(bytesRead > 0){ return totalBytesRead;
bytesRead = this.socketChannel.read(byteBuffer); }
totalBytesRead += bytesRead;
}
if(bytesRead == -1){
this.endOfStreamReached = true;
}
return totalBytesRead; public int write(ByteBuffer byteBuffer) throws IOException {
} int bytesWritten = socketChannel.write(byteBuffer);
int totalBytesWritten = bytesWritten;
public int write(ByteBuffer byteBuffer) throws IOException{ while (bytesWritten > 0 && byteBuffer.hasRemaining()) {
int bytesWritten = this.socketChannel.write(byteBuffer); bytesWritten = socketChannel.write(byteBuffer);
int totalBytesWritten = bytesWritten; totalBytesWritten += bytesWritten;
}
while(bytesWritten > 0 && byteBuffer.hasRemaining()){
bytesWritten = this.socketChannel.write(byteBuffer);
totalBytesWritten += bytesWritten;
}
return totalBytesWritten;
}
return totalBytesWritten;
}
} }

68
src/main/java/com/jenkov/nioserver/SocketAcceptor.java
View File

@ -2,52 +2,50 @@ package com.jenkov.nioserver;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.nio.channels.ServerSocketChannel; import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.util.Queue; import java.util.Queue;
/** /**
* Created by jjenkov on 19-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>SocketAcceptor.java</strong><br>
* Created: <strong>19 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class SocketAccepter implements Runnable{ public class SocketAcceptor implements Runnable {
private int tcpPort = 0; private int tcpPort;
private ServerSocketChannel serverSocket = null; private ServerSocketChannel serverSocket;
private Queue socketQueue = null; private Queue<Socket> socketQueue;
public SocketAccepter(int tcpPort, Queue socketQueue) { public SocketAcceptor(int tcpPort, Queue<Socket> socketQueue) {
this.tcpPort = tcpPort; this.tcpPort = tcpPort;
this.socketQueue = socketQueue; this.socketQueue = socketQueue;
} }
public void run() {
try {
serverSocket = ServerSocketChannel.open();
serverSocket.bind(new InetSocketAddress(tcpPort));
} catch (IOException e) {
e.printStackTrace();
return;
}
while (true) {
try {
SocketChannel socketChannel = serverSocket.accept();
public void run() { System.out.println("Socket accepted: " + socketChannel);
try{
this.serverSocket = ServerSocketChannel.open();
this.serverSocket.bind(new InetSocketAddress(tcpPort));
} catch(IOException e){
e.printStackTrace();
return;
}
// TODO: check if the queue can even accept more sockets.
this.socketQueue.add(new Socket(socketChannel));
while(true){ } catch (IOException e) {
try{ e.printStackTrace();
SocketChannel socketChannel = this.serverSocket.accept(); }
}
System.out.println("Socket accepted: " + socketChannel); }
}
//todo check if the queue can even accept more sockets.
this.socketQueue.add(new Socket(socketChannel));
} catch(IOException e){
e.printStackTrace();
}
}
}
}

314
src/main/java/com/jenkov/nioserver/SocketProcessor.java
View File

@ -5,211 +5,207 @@ import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
import java.nio.channels.Selector; import java.nio.channels.Selector;
import java.util.*; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
/** /**
* Created by jjenkov on 16-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>SocketProcessor.java</strong><br>
* Created: <strong>16 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class SocketProcessor implements Runnable { public class SocketProcessor implements Runnable {
private Queue<Socket> inboundSocketQueue = null; private Queue<Socket> inboundSocketQueue;
private MessageBuffer readMessageBuffer = null; //todo Not used now - but perhaps will be later - to check for space in the buffer before reading from sockets private MessageBuffer readMessageBuffer; // TODO: Not used now - but perhaps will be later - to check for space in the
private MessageBuffer writeMessageBuffer = null; //todo Not used now - but perhaps will be later - to check for space in the buffer before reading from sockets (space for more to write?) // buffer before reading from sockets
@SuppressWarnings("unused")
private MessageBuffer writeMessageBuffer; // TODO: Not used now - but perhaps will be later - to check for space in the
// buffer before reading from sockets (space for more to write?)
private IMessageReaderFactory messageReaderFactory = null; private IMessageReaderFactory messageReaderFactory;
private Queue<Message> outboundMessageQueue = new LinkedList<>(); //todo use a better / faster queue. private Queue<Message> outboundMessageQueue = new LinkedList<>(); // TODO: use a better / faster queue.
private Map<Long, Socket> socketMap = new HashMap<>(); private Map<Long, Socket> socketMap = new HashMap<>();
private ByteBuffer readByteBuffer = ByteBuffer.allocate(1024 * 1024); private ByteBuffer readByteBuffer = ByteBuffer.allocate(1024 * 1024);
private ByteBuffer writeByteBuffer = ByteBuffer.allocate(1024 * 1024); private ByteBuffer writeByteBuffer = ByteBuffer.allocate(1024 * 1024);
private Selector readSelector = null; private Selector readSelector;
private Selector writeSelector = null; private Selector writeSelector;
private IMessageProcessor messageProcessor = null; private IMessageProcessor messageProcessor;
private WriteProxy writeProxy = null; private WriteProxy writeProxy;
private long nextSocketId = 16 * 1024; //start incoming socket ids from 16K - reserve bottom ids for pre-defined sockets (servers). private long nextSocketId = 16 * 1024; // start incoming socket ids from 16K - reserve bottom ids for pre-defined
// sockets (servers).
private Set<Socket> emptyToNonEmptySockets = new HashSet<>(); private Set<Socket> emptyToNonEmptySockets = new HashSet<>();
private Set<Socket> nonEmptyToEmptySockets = new HashSet<>(); private Set<Socket> nonEmptyToEmptySockets = new HashSet<>();
public SocketProcessor(Queue<Socket> inboundSocketQueue, MessageBuffer readMessageBuffer, MessageBuffer writeMessageBuffer,
IMessageReaderFactory messageReaderFactory, IMessageProcessor messageProcessor) throws IOException {
this.inboundSocketQueue = inboundSocketQueue;
public SocketProcessor(Queue<Socket> inboundSocketQueue, MessageBuffer readMessageBuffer, MessageBuffer writeMessageBuffer, IMessageReaderFactory messageReaderFactory, IMessageProcessor messageProcessor) throws IOException { this.readMessageBuffer = readMessageBuffer;
this.inboundSocketQueue = inboundSocketQueue; this.writeMessageBuffer = writeMessageBuffer;
writeProxy = new WriteProxy(writeMessageBuffer, this.outboundMessageQueue);
this.readMessageBuffer = readMessageBuffer; this.messageReaderFactory = messageReaderFactory;
this.writeMessageBuffer = writeMessageBuffer;
this.writeProxy = new WriteProxy(writeMessageBuffer, this.outboundMessageQueue);
this.messageReaderFactory = messageReaderFactory; this.messageProcessor = messageProcessor;
this.messageProcessor = messageProcessor; readSelector = Selector.open();
writeSelector = Selector.open();
}
this.readSelector = Selector.open(); public void run() {
this.writeSelector = Selector.open(); while (true) {
} try {
executeCycle();
Thread.sleep(100);
} catch (IOException | InterruptedException e) {
e.printStackTrace();
}
}
}
public void run() { public void executeCycle() throws IOException {
while(true){ takeNewSockets();
try{ readFromSockets();
executeCycle(); writeToSockets();
} catch(IOException e){ }
e.printStackTrace();
}
try { public void takeNewSockets() throws IOException {
Thread.sleep(100); Socket newSocket = inboundSocketQueue.poll();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
while (newSocket != null) {
newSocket.socketId = nextSocketId++;
newSocket.socketChannel.configureBlocking(false);
public void executeCycle() throws IOException { newSocket.messageReader = messageReaderFactory.createMessageReader();
takeNewSockets(); newSocket.messageReader.init(readMessageBuffer);
readFromSockets();
writeToSockets();
}
newSocket.messageWriter = new MessageWriter();
public void takeNewSockets() throws IOException { socketMap.put(newSocket.socketId, newSocket);
Socket newSocket = this.inboundSocketQueue.poll();
while(newSocket != null){ SelectionKey key = newSocket.socketChannel.register(readSelector, SelectionKey.OP_READ);
newSocket.socketId = this.nextSocketId++; key.attach(newSocket);
newSocket.socketChannel.configureBlocking(false);
newSocket.messageReader = this.messageReaderFactory.createMessageReader(); newSocket = inboundSocketQueue.poll();
newSocket.messageReader.init(this.readMessageBuffer); }
}
newSocket.messageWriter = new MessageWriter(); public void readFromSockets() throws IOException {
int readReady = readSelector.selectNow();
this.socketMap.put(newSocket.socketId, newSocket); if (readReady > 0) {
Set<SelectionKey> selectedKeys = this.readSelector.selectedKeys();
Iterator<SelectionKey> keyIterator = selectedKeys.iterator();
SelectionKey key = newSocket.socketChannel.register(this.readSelector, SelectionKey.OP_READ); while (keyIterator.hasNext()) {
key.attach(newSocket); SelectionKey key = keyIterator.next();
readFromSocket(key);
keyIterator.remove();
}
selectedKeys.clear();
}
}
newSocket = this.inboundSocketQueue.poll(); private void readFromSocket(SelectionKey key) throws IOException {
} Socket socket = (Socket) key.attachment();
} socket.messageReader.read(socket, this.readByteBuffer);
List<Message> fullMessages = socket.messageReader.getMessages();
if (fullMessages.size() > 0) {
for (Message message : fullMessages) {
message.socketId = socket.socketId;
messageProcessor.process(message, writeProxy); // the message processor will eventually push outgoing messages into an
// IMessageWriter for this socket.
}
fullMessages.clear();
}
public void readFromSockets() throws IOException { if (socket.endOfStreamReached) {
int readReady = this.readSelector.selectNow(); System.out.println("Socket closed: " + socket.socketId);
socketMap.remove(socket.socketId);
key.attach(null);
key.cancel();
key.channel().close();
}
}
if(readReady > 0){ public void writeToSockets() throws IOException {
Set<SelectionKey> selectedKeys = this.readSelector.selectedKeys();
Iterator<SelectionKey> keyIterator = selectedKeys.iterator();
while(keyIterator.hasNext()) { // Take all new messages from outboundMessageQueue
SelectionKey key = keyIterator.next(); takeNewOutboundMessages();
readFromSocket(key); // Cancel all sockets which have no more data to write.
cancelEmptySockets();
keyIterator.remove(); // Register all sockets that *have* data and which are not yet registered.
} registerNonEmptySockets();
selectedKeys.clear();
}
}
private void readFromSocket(SelectionKey key) throws IOException { // Select from the Selector.
Socket socket = (Socket) key.attachment(); int writeReady = this.writeSelector.selectNow();
socket.messageReader.read(socket, this.readByteBuffer);
List<Message> fullMessages = socket.messageReader.getMessages(); if (writeReady > 0) {
if(fullMessages.size() > 0){ Set<SelectionKey> selectionKeys = this.writeSelector.selectedKeys();
for(Message message : fullMessages){ Iterator<SelectionKey> keyIterator = selectionKeys.iterator();
message.socketId = socket.socketId;
this.messageProcessor.process(message, this.writeProxy); //the message processor will eventually push outgoing messages into an IMessageWriter for this socket.
}
fullMessages.clear();
}
if(socket.endOfStreamReached){ while (keyIterator.hasNext()) {
System.out.println("Socket closed: " + socket.socketId); SelectionKey key = keyIterator.next();
this.socketMap.remove(socket.socketId);
key.attach(null);
key.cancel();
key.channel().close();
}
}
Socket socket = (Socket) key.attachment();
public void writeToSockets() throws IOException { socket.messageWriter.write(socket, this.writeByteBuffer);
// Take all new messages from outboundMessageQueue if (socket.messageWriter.isEmpty()) { this.nonEmptyToEmptySockets.add(socket); }
takeNewOutboundMessages();
// Cancel all sockets which have no more data to write. keyIterator.remove();
cancelEmptySockets(); }
selectionKeys.clear();
}
}
// Register all sockets that *have* data and which are not yet registered. private void registerNonEmptySockets() throws ClosedChannelException {
registerNonEmptySockets(); for (Socket socket : emptyToNonEmptySockets)
socket.socketChannel.register(writeSelector, SelectionKey.OP_WRITE, socket);
emptyToNonEmptySockets.clear();
}
// Select from the Selector. private void cancelEmptySockets() {
int writeReady = this.writeSelector.selectNow(); for (Socket socket : nonEmptyToEmptySockets) {
SelectionKey key = socket.socketChannel.keyFor(this.writeSelector);
key.cancel();
}
nonEmptyToEmptySockets.clear();
}
if(writeReady > 0){ private void takeNewOutboundMessages() {
Set<SelectionKey> selectionKeys = this.writeSelector.selectedKeys(); Message outMessage = outboundMessageQueue.poll();
Iterator<SelectionKey> keyIterator = selectionKeys.iterator(); while (outMessage != null) {
Socket socket = socketMap.get(outMessage.socketId);
while(keyIterator.hasNext()){ if (socket != null) {
SelectionKey key = keyIterator.next(); MessageWriter messageWriter = socket.messageWriter;
if (messageWriter.isEmpty()) {
messageWriter.enqueue(outMessage);
nonEmptyToEmptySockets.remove(socket);
emptyToNonEmptySockets.add(socket); // not necessary if removed from nonEmptyToEmptySockets in prev. statement.
} else messageWriter.enqueue(outMessage);
}
Socket socket = (Socket) key.attachment(); outMessage = outboundMessageQueue.poll();
}
socket.messageWriter.write(socket, this.writeByteBuffer); }
}
if(socket.messageWriter.isEmpty()){
this.nonEmptyToEmptySockets.add(socket);
}
keyIterator.remove();
}
selectionKeys.clear();
}
}
private void registerNonEmptySockets() throws ClosedChannelException {
for(Socket socket : emptyToNonEmptySockets){
socket.socketChannel.register(this.writeSelector, SelectionKey.OP_WRITE, socket);
}
emptyToNonEmptySockets.clear();
}
private void cancelEmptySockets() {
for(Socket socket : nonEmptyToEmptySockets){
SelectionKey key = socket.socketChannel.keyFor(this.writeSelector);
key.cancel();
}
nonEmptyToEmptySockets.clear();
}
private void takeNewOutboundMessages() {
Message outMessage = this.outboundMessageQueue.poll();
while(outMessage != null){
Socket socket = this.socketMap.get(outMessage.socketId);
if(socket != null){
MessageWriter messageWriter = socket.messageWriter;
if(messageWriter.isEmpty()){
messageWriter.enqueue(outMessage);
nonEmptyToEmptySockets.remove(socket);
emptyToNonEmptySockets.add(socket); //not necessary if removed from nonEmptyToEmptySockets in prev. statement.
} else{
messageWriter.enqueue(outMessage);
}
}
outMessage = this.outboundMessageQueue.poll();
}
}
}

29
src/main/java/com/jenkov/nioserver/WriteProxy.java
View File

@ -3,24 +3,23 @@ package com.jenkov.nioserver;
import java.util.Queue; import java.util.Queue;
/** /**
* Created by jjenkov on 22-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>WriteProxy.java</strong><br>
* Created: <strong>22 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class WriteProxy { public class WriteProxy {
private MessageBuffer messageBuffer = null; private MessageBuffer messageBuffer;
private Queue writeQueue = null; private Queue<Message> writeQueue;
public WriteProxy(MessageBuffer messageBuffer, Queue writeQueue) { public WriteProxy(MessageBuffer messageBuffer, Queue<Message> writeQueue) {
this.messageBuffer = messageBuffer; this.messageBuffer = messageBuffer;
this.writeQueue = writeQueue; this.writeQueue = writeQueue;
} }
public Message getMessage(){ public Message getMessage() { return messageBuffer.getMessage(); }
return this.messageBuffer.getMessage();
}
public boolean enqueue(Message message){ public boolean enqueue(Message message) { return writeQueue.offer(message); }
return this.writeQueue.offer(message); }
}
}

52
src/main/java/com/jenkov/nioserver/example/Main.java
View File

@ -1,42 +1,40 @@
package com.jenkov.nioserver.example; package com.jenkov.nioserver.example;
import com.jenkov.nioserver.*; import java.io.IOException;
import com.jenkov.nioserver.IMessageProcessor;
import com.jenkov.nioserver.Message;
import com.jenkov.nioserver.Server;
import com.jenkov.nioserver.http.HttpMessageReaderFactory; import com.jenkov.nioserver.http.HttpMessageReaderFactory;
import java.io.IOException;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
/** /**
* Created by jjenkov on 19-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>Main.java</strong><br>
* Created: <strong>19 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class Main { public class Main {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
String httpResponse = "HTTP/1.1 200 OK\r\n" + String httpResponse = "HTTP/1.1 200 OK\r\n" + "Content-Length: 38\r\n" + "Content-Type: text/html\r\n" + "\r\n"
"Content-Length: 38\r\n" + + "<html><body>Hello World!</body></html>";
"Content-Type: text/html\r\n" +
"\r\n" +
"<html><body>Hello World!</body></html>";
byte[] httpResponseBytes = httpResponse.getBytes("UTF-8"); byte[] httpResponseBytes = httpResponse.getBytes("UTF-8");
IMessageProcessor messageProcessor = (request, writeProxy) -> { IMessageProcessor messageProcessor = (request, writeProxy) -> {
System.out.println("Message Received from socket: " + request.socketId); System.out.println("Message Received from socket: " + request.socketId);
Message response = writeProxy.getMessage(); Message response = writeProxy.getMessage();
response.socketId = request.socketId; response.socketId = request.socketId;
response.writeToMessage(httpResponseBytes); response.writeToMessage(httpResponseBytes);
writeProxy.enqueue(response); writeProxy.enqueue(response);
}; };
Server server = new Server(9999, new HttpMessageReaderFactory(), messageProcessor); Server server = new Server(9999, new HttpMessageReaderFactory(), messageProcessor);
server.start(); server.start();
}
} }
}

34
src/main/java/com/jenkov/nioserver/http/HttpHeaders.java
View File

@ -1,27 +1,27 @@
package com.jenkov.nioserver.http; package com.jenkov.nioserver.http;
/** /**
* Created by jjenkov on 19-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpHeaders.java</strong><br>
* Created: <strong>19 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class HttpHeaders { public class HttpHeaders {
public static int HTTP_METHOD_GET = 1; public static int HTTP_METHOD_GET = 1;
public static int HTTP_METHOD_POST = 2; public static int HTTP_METHOD_POST = 2;
public static int HTTP_METHOD_PUT = 3; public static int HTTP_METHOD_PUT = 3;
public static int HTTP_METHOD_HEAD = 4; public static int HTTP_METHOD_HEAD = 4;
public static int HTTP_METHOD_DELETE = 5; public static int HTTP_METHOD_DELETE = 5;
public int httpMethod = 0; public int httpMethod = 0;
public int hostStartIndex = 0; public int hostStartIndex = 0;
public int hostEndIndex = 0; public int hostEndIndex = 0;
public int contentLength = 0; public int contentLength = 0;
public int bodyStartIndex = 0; public int bodyStartIndex = 0;
public int bodyEndIndex = 0; public int bodyEndIndex = 0;
}
}

88
src/main/java/com/jenkov/nioserver/http/HttpMessageReader.java
View File

@ -1,64 +1,64 @@
package com.jenkov.nioserver.http; package com.jenkov.nioserver.http;
import com.jenkov.nioserver.IMessageReader;
import com.jenkov.nioserver.Message;
import com.jenkov.nioserver.MessageBuffer;
import com.jenkov.nioserver.Socket;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.jenkov.nioserver.IMessageReader;
import com.jenkov.nioserver.Message;
import com.jenkov.nioserver.MessageBuffer;
import com.jenkov.nioserver.Socket;
/** /**
* Created by jjenkov on 18-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpMessageReader.java</strong><br>
* Created: <strong>18 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class HttpMessageReader implements IMessageReader { public class HttpMessageReader implements IMessageReader {
private MessageBuffer messageBuffer = null; private MessageBuffer messageBuffer;
private List<Message> completeMessages = new ArrayList<Message>(); private List<Message> completeMessages = new ArrayList<>();
private Message nextMessage = null; private Message nextMessage;
public HttpMessageReader() { @Override
} public void init(MessageBuffer readMessageBuffer) {
messageBuffer = readMessageBuffer;
nextMessage = messageBuffer.getMessage();
nextMessage.metaData = new HttpHeaders();
}
@Override @Override
public void init(MessageBuffer readMessageBuffer) { public void read(Socket socket, ByteBuffer byteBuffer) throws IOException {
this.messageBuffer = readMessageBuffer; socket.read(byteBuffer);
this.nextMessage = messageBuffer.getMessage(); byteBuffer.flip();
this.nextMessage.metaData = new HttpHeaders();
}
@Override if (byteBuffer.remaining() == 0) {
public void read(Socket socket, ByteBuffer byteBuffer) throws IOException { byteBuffer.clear();
int bytesRead = socket.read(byteBuffer); return;
byteBuffer.flip(); }
if(byteBuffer.remaining() == 0){ nextMessage.writeToMessage(byteBuffer);
byteBuffer.clear();
return;
}
this.nextMessage.writeToMessage(byteBuffer); int endIndex = HttpUtil.parseHttpRequest(nextMessage.sharedArray,
nextMessage.offset,
nextMessage.offset + nextMessage.length,
(HttpHeaders) nextMessage.metaData);
if (endIndex != -1) {
Message message = messageBuffer.getMessage();
message.metaData = new HttpHeaders();
int endIndex = HttpUtil.parseHttpRequest(this.nextMessage.sharedArray, this.nextMessage.offset, this.nextMessage.offset + this.nextMessage.length, (HttpHeaders) this.nextMessage.metaData); message.writePartialMessageToMessage(nextMessage, endIndex);
if(endIndex != -1){
Message message = this.messageBuffer.getMessage();
message.metaData = new HttpHeaders();
message.writePartialMessageToMessage(nextMessage, endIndex); completeMessages.add(nextMessage);
nextMessage = message;
}
byteBuffer.clear();
}
completeMessages.add(nextMessage); @Override
nextMessage = message; public List<Message> getMessages() { return completeMessages; }
} }
byteBuffer.clear();
}
@Override
public List<Message> getMessages() {
return this.completeMessages;
}
}

18
src/main/java/com/jenkov/nioserver/http/HttpMessageReaderFactory.java
View File

@ -2,18 +2,16 @@ package com.jenkov.nioserver.http;
import com.jenkov.nioserver.IMessageReader; import com.jenkov.nioserver.IMessageReader;
import com.jenkov.nioserver.IMessageReaderFactory; import com.jenkov.nioserver.IMessageReaderFactory;
import com.jenkov.nioserver.MessageBuffer;
/** /**
* Created by jjenkov on 18-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpMessageReaderFactory.java</strong><br>
* Created: <strong>18 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class HttpMessageReaderFactory implements IMessageReaderFactory { public class HttpMessageReaderFactory implements IMessageReaderFactory {
public HttpMessageReaderFactory() { @Override
} public IMessageReader createMessageReader() { return new HttpMessageReader(); }
}
@Override
public IMessageReader createMessageReader() {
return new HttpMessageReader();
}
}

244
src/main/java/com/jenkov/nioserver/http/HttpUtil.java
View File

@ -3,153 +3,143 @@ package com.jenkov.nioserver.http;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
/** /**
* Created by jjenkov on 19-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpUtil.java</strong><br>
* Created: <strong>19 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class HttpUtil { public class HttpUtil {
private static final byte[] GET = new byte[]{'G','E','T'}; private static final byte[] GET = new byte[] { 'G', 'E', 'T' };
private static final byte[] POST = new byte[]{'P','O','S','T'}; private static final byte[] POST = new byte[] { 'P', 'O', 'S', 'T' };
private static final byte[] PUT = new byte[]{'P','U','T'}; private static final byte[] PUT = new byte[] { 'P', 'U', 'T' };
private static final byte[] HEAD = new byte[]{'H','E','A','D'}; private static final byte[] HEAD = new byte[] { 'H', 'E', 'A', 'D' };
private static final byte[] DELETE = new byte[]{'D','E','L','E','T','E'}; private static final byte[] DELETE = new byte[] { 'D', 'E', 'L', 'E', 'T', 'E' };
private static final byte[] HOST = new byte[]{'H','o','s','t'}; @SuppressWarnings("unused")
private static final byte[] CONTENT_LENGTH = new byte[]{'C','o','n','t','e','n','t','-','L','e','n','g','t','h'}; private static final byte[] HOST = new byte[] { 'H', 'o', 's', 't' };
private static final byte[] CONTENT_LENGTH = new byte[] { 'C', 'o', 'n', 't', 'e', 'n', 't', '-', 'L', 'e', 'n', 'g', 't', 'h' };
public static int parseHttpRequest(byte[] src, int startIndex, int endIndex, HttpHeaders httpHeaders){ public static int parseHttpRequest(byte[] src, int startIndex, int endIndex, HttpHeaders httpHeaders) {
/*
* int endOfHttpMethod = findNext(src, startIndex, endIndex, (byte) ' ');
* if(endOfHttpMethod == -1) return false;
* resolveHttpMethod(src, startIndex, httpHeaders);
*/
/* // parse HTTP request line
int endOfHttpMethod = findNext(src, startIndex, endIndex, (byte) ' '); int endOfFirstLine = findNextLineBreak(src, startIndex, endIndex);
if(endOfHttpMethod == -1) return false; if (endOfFirstLine == -1) return -1;
resolveHttpMethod(src, startIndex, httpHeaders);
*/
//parse HTTP request line // parse HTTP headers
int endOfFirstLine = findNextLineBreak(src, startIndex, endIndex); int prevEndOfHeader = endOfFirstLine + 1;
if(endOfFirstLine == -1) return -1; int endOfHeader = findNextLineBreak(src, prevEndOfHeader, endIndex);
while (endOfHeader != -1 && endOfHeader != prevEndOfHeader + 1) { // prevEndOfHeader + 1 = end of previous header + 2 (+2 = CR + LF)
//parse HTTP headers if (matches(src, prevEndOfHeader, CONTENT_LENGTH)) {
int prevEndOfHeader = endOfFirstLine + 1; try {
int endOfHeader = findNextLineBreak(src, prevEndOfHeader, endIndex); findContentLength(src, prevEndOfHeader, endIndex, httpHeaders);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
while(endOfHeader != -1 && endOfHeader != prevEndOfHeader + 1){ //prevEndOfHeader + 1 = end of previous header + 2 (+2 = CR + LF) prevEndOfHeader = endOfHeader + 1;
endOfHeader = findNextLineBreak(src, prevEndOfHeader, endIndex);
}
if(matches(src, prevEndOfHeader, CONTENT_LENGTH)){ if (endOfHeader == -1) { return -1; }
try {
findContentLength(src, prevEndOfHeader, endIndex, httpHeaders);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
prevEndOfHeader = endOfHeader + 1; // check that byte array contains full HTTP message.
endOfHeader = findNextLineBreak(src, prevEndOfHeader, endIndex); int bodyStartIndex = endOfHeader + 1;
} int bodyEndIndex = bodyStartIndex + httpHeaders.contentLength;
if(endOfHeader == -1){ if (bodyEndIndex <= endIndex) {
return -1; // byte array contains a full HTTP request
} httpHeaders.bodyStartIndex = bodyStartIndex;
httpHeaders.bodyEndIndex = bodyEndIndex;
return bodyEndIndex;
}
//check that byte array contains full HTTP message. return -1;
int bodyStartIndex = endOfHeader + 1; }
int bodyEndIndex = bodyStartIndex + httpHeaders.contentLength;
if(bodyEndIndex <= endIndex){ private static void findContentLength(byte[] src, int startIndex, int endIndex, HttpHeaders httpHeaders) throws UnsupportedEncodingException {
//byte array contains a full HTTP request int indexOfColon = findNext(src, startIndex, endIndex, (byte) ':');
httpHeaders.bodyStartIndex = bodyStartIndex;
httpHeaders.bodyEndIndex = bodyEndIndex;
return bodyEndIndex;
}
// skip spaces after colon
int index = indexOfColon + 1;
while (src[index] == ' ') {
index++;
}
return -1; int valueStartIndex = index;
} int valueEndIndex = index;
boolean endOfValueFound = false;
private static void findContentLength(byte[] src, int startIndex, int endIndex, HttpHeaders httpHeaders) throws UnsupportedEncodingException { while (index < endIndex && !endOfValueFound) {
int indexOfColon = findNext(src, startIndex, endIndex, (byte) ':'); switch (src[index]) {
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
index++;
break;
default:
endOfValueFound = true;
valueEndIndex = index;
}
}
httpHeaders.contentLength = Integer.parseInt(new String(src, valueStartIndex, valueEndIndex - valueStartIndex, "UTF-8"));
}
//skip spaces after colon public static int findNext(byte[] src, int startIndex, int endIndex, byte value) {
int index = indexOfColon +1; for (int index = startIndex; index < endIndex; index++)
while(src[index] == ' '){ if (src[index] == value) return index;
index++; return -1;
} }
int valueStartIndex = index; public static int findNextLineBreak(byte[] src, int startIndex, int endIndex) {
int valueEndIndex = index; for (int index = startIndex; index < endIndex; index++)
boolean endOfValueFound = false; if (src[index] == '\n') if (src[index - 1] == '\r') return index;
return -1;
}
while(index < endIndex && !endOfValueFound){ public static void resolveHttpMethod(byte[] src, int startIndex, HttpHeaders httpHeaders) {
switch(src[index]){ if (matches(src, startIndex, GET)) {
case '0' : ; httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_GET;
case '1' : ; return;
case '2' : ; }
case '3' : ; if (matches(src, startIndex, POST)) {
case '4' : ; httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_POST;
case '5' : ; return;
case '6' : ; }
case '7' : ; if (matches(src, startIndex, PUT)) {
case '8' : ; httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_PUT;
case '9' : { index++; break; } return;
}
if (matches(src, startIndex, HEAD)) {
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_HEAD;
return;
}
if (matches(src, startIndex, DELETE)) {
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_DELETE;
return;
}
}
default: { public static boolean matches(byte[] src, int offset, byte[] value) {
endOfValueFound = true; for (int i = offset, n = 0; n < value.length; i++, n++)
valueEndIndex = index; if (src[i] != value[n]) return false;
} return true;
} }
} }
httpHeaders.contentLength = Integer.parseInt(new String(src, valueStartIndex, valueEndIndex - valueStartIndex, "UTF-8"));
}
public static int findNext(byte[] src, int startIndex, int endIndex, byte value){
for(int index = startIndex; index < endIndex; index++){
if(src[index] == value) return index;
}
return -1;
}
public static int findNextLineBreak(byte[] src, int startIndex, int endIndex) {
for(int index = startIndex; index < endIndex; index++){
if(src[index] == '\n'){
if(src[index - 1] == '\r'){
return index;
}
};
}
return -1;
}
public static void resolveHttpMethod(byte[] src, int startIndex, HttpHeaders httpHeaders){
if(matches(src, startIndex, GET)) {
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_GET;
return;
}
if(matches(src, startIndex, POST)){
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_POST;
return;
}
if(matches(src, startIndex, PUT)){
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_PUT;
return;
}
if(matches(src, startIndex, HEAD)){
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_HEAD;
return;
}
if(matches(src, startIndex, DELETE)){
httpHeaders.httpMethod = HttpHeaders.HTTP_METHOD_DELETE;
return;
}
}
public static boolean matches(byte[] src, int offset, byte[] value){
for(int i=offset, n=0; n < value.length; i++, n++){
if(src[i] != value[n]) return false;
}
return true;
}
}

113
src/test/java/com/jenkov/nioserver/MessageBufferTest.java
View File

@ -1,80 +1,79 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
import org.junit.Test; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.Assert.assertEquals; import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
/** /**
* Created by jjenkov on 18-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>MessageBufferTest.java</strong><br>
* Created: <strong>18 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class MessageBufferTest { public class MessageBufferTest {
@Test @Test
public void testGetMessage() { public void testGetMessage() {
MessageBuffer messageBuffer = new MessageBuffer(); MessageBuffer messageBuffer = new MessageBuffer();
Message message = messageBuffer.getMessage(); Message message = messageBuffer.getMessage();
assertNotNull(message); assertNotNull(message);
assertEquals(0 , message.offset); assertEquals(0, message.offset);
assertEquals(0 , message.length); assertEquals(0, message.length);
assertEquals(4 * 1024, message.capacity); assertEquals(4 * 1024, message.capacity);
Message message2 = messageBuffer.getMessage(); Message message2 = messageBuffer.getMessage();
assertNotNull(message2); assertNotNull(message2);
assertEquals(4096 , message2.offset); assertEquals(4096, message2.offset);
assertEquals(0 , message2.length); assertEquals(0, message2.length);
assertEquals(4 * 1024, message2.capacity); assertEquals(4 * 1024, message2.capacity);
//todo test what happens if the small buffer space is depleted of messages. // TODO: test what happens if the small buffer space is depleted of messages.
}
} @Test
public void testExpandMessage() {
MessageBuffer messageBuffer = new MessageBuffer();
Message message = messageBuffer.getMessage();
@Test byte[] smallSharedArray = message.sharedArray;
public void testExpandMessage(){
MessageBuffer messageBuffer = new MessageBuffer();
Message message = messageBuffer.getMessage(); assertNotNull(message);
assertEquals(0, message.offset);
assertEquals(0, message.length);
assertEquals(4 * 1024, message.capacity);
byte[] smallSharedArray = message.sharedArray; messageBuffer.expandMessage(message);
assertEquals(0, message.offset);
assertEquals(0, message.length);
assertEquals(128 * 1024, message.capacity);
assertNotNull(message); byte[] mediumSharedArray = message.sharedArray;
assertEquals(0 , message.offset); assertNotSame(smallSharedArray, mediumSharedArray);
assertEquals(0 , message.length);
assertEquals(4 * 1024, message.capacity);
messageBuffer.expandMessage(message); messageBuffer.expandMessage(message);
assertEquals(0 , message.offset); assertEquals(0, message.offset);
assertEquals(0 , message.length); assertEquals(0, message.length);
assertEquals(128 * 1024, message.capacity); assertEquals(1024 * 1024, message.capacity);
byte[] mediumSharedArray = message.sharedArray; byte[] largeSharedArray = message.sharedArray;
assertNotSame(smallSharedArray, mediumSharedArray); assertNotSame(smallSharedArray, largeSharedArray);
assertNotSame(mediumSharedArray, largeSharedArray);
messageBuffer.expandMessage(message); // next expansion should not be possible.
assertEquals(0 , message.offset); assertFalse(messageBuffer.expandMessage(message));
assertEquals(0 , message.length); assertEquals(0, message.offset);
assertEquals(1024 * 1024, message.capacity); assertEquals(0, message.length);
assertEquals(1024 * 1024, message.capacity);
byte[] largeSharedArray = message.sharedArray; assertSame(message.sharedArray, largeSharedArray);
assertNotSame(smallSharedArray, largeSharedArray); }
assertNotSame(mediumSharedArray, largeSharedArray); }
//next expansion should not be possible.
assertFalse(messageBuffer.expandMessage(message));
assertEquals(0 , message.offset);
assertEquals(0 , message.length);
assertEquals(1024 * 1024, message.capacity);
assertSame(message.sharedArray, largeSharedArray);
}
}

81
src/test/java/com/jenkov/nioserver/MessageTest.java
View File

@ -1,59 +1,56 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
import org.junit.Test; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.junit.jupiter.api.Test;
/** /**
* Created by jjenkov on 18-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>MessageTest.java</strong><br>
* Created: <strong>18 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class MessageTest { public class MessageTest {
@Test
public void testWriteToMessage() {
MessageBuffer messageBuffer = new MessageBuffer();
@Test Message message = messageBuffer.getMessage();
public void testWriteToMessage() { ByteBuffer byteBuffer = ByteBuffer.allocate(1024 * 1024);
MessageBuffer messageBuffer = new MessageBuffer();
Message message = messageBuffer.getMessage(); fill(byteBuffer, 4096);
ByteBuffer byteBuffer = ByteBuffer.allocate(1024 * 1024);
fill(byteBuffer, 4096); int written = message.writeToMessage(byteBuffer);
assertEquals(4096, written);
assertEquals(4096, message.length);
assertSame(messageBuffer.smallMessageBuffer, message.sharedArray);
int written = message.writeToMessage(byteBuffer); fill(byteBuffer, 124 * 1024);
assertEquals(4096, written); written = message.writeToMessage(byteBuffer);
assertEquals(4096, message.length); assertEquals(124 * 1024, written);
assertSame(messageBuffer.smallMessageBuffer, message.sharedArray); assertEquals(128 * 1024, message.length);
assertSame(messageBuffer.mediumMessageBuffer, message.sharedArray);
fill(byteBuffer, 124 * 1024); fill(byteBuffer, (1024 - 128) * 1024);
written = message.writeToMessage(byteBuffer); written = message.writeToMessage(byteBuffer);
assertEquals(124 * 1024, written); assertEquals(896 * 1024, written);
assertEquals(128 * 1024, message.length); assertEquals(1024 * 1024, message.length);
assertSame(messageBuffer.mediumMessageBuffer, message.sharedArray); assertSame(messageBuffer.largeMessageBuffer, message.sharedArray);
fill(byteBuffer, (1024-128) * 1024); fill(byteBuffer, 1);
written = message.writeToMessage(byteBuffer); written = message.writeToMessage(byteBuffer);
assertEquals(896 * 1024, written); assertEquals(-1, written);
assertEquals(1024 * 1024, message.length); }
assertSame(messageBuffer.largeMessageBuffer, message.sharedArray);
fill(byteBuffer, 1); private void fill(ByteBuffer byteBuffer, int length) {
written = message.writeToMessage(byteBuffer); byteBuffer.clear();
assertEquals(-1, written); for (int i = 0; i < length; i++)
byteBuffer.put((byte) (i % 128));
} byteBuffer.flip();
}
private void fill(ByteBuffer byteBuffer, int length){ }
byteBuffer.clear();
for(int i=0; i<length; i++){
byteBuffer.put((byte) (i%128));
}
byteBuffer.flip();
}
}

17
src/test/java/com/jenkov/nioserver/SelectorTest.java
View File

@ -1,15 +1,19 @@
package com.jenkov.nioserver; package com.jenkov.nioserver;
import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
import java.nio.channels.Selector; import java.nio.channels.Selector;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import org.junit.jupiter.api.Test;
/** /**
* Created by jjenkov on 21-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>SelectorTest.java</strong><br>
* Created: <strong>21 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class SelectorTest { public class SelectorTest {
@ -27,10 +31,5 @@ public class SelectorTest {
SelectionKey key2 = socketChannel.register(selector, SelectionKey.OP_WRITE); SelectionKey key2 = socketChannel.register(selector, SelectionKey.OP_WRITE);
key2.cancel(); key2.cancel();
} }
}
}

109
src/test/java/com/jenkov/nioserver/http/HttpUtilTest.java
View File

@ -1,88 +1,67 @@
package com.jenkov.nioserver.http; package com.jenkov.nioserver.http;
import org.junit.Test; import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import static org.junit.Assert.assertEquals; import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
/** /**
* Created by jjenkov on 19-10-2015. * Project: <strong>java-nio-server</strong><br>
* File: <strong>HttpUtilTest.java</strong><br>
* Created: <strong>19 Oct 2015</strong><br>
*
* @author jjenkov
*/ */
public class HttpUtilTest { public class HttpUtilTest {
@Test @Test
public void testResolveHttpMethod() throws UnsupportedEncodingException { public void testResolveHttpMethod() throws UnsupportedEncodingException {
assertHttpMethod("GET / HTTP/1.1\r\n" , HttpHeaders.HTTP_METHOD_GET); assertHttpMethod("GET / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_GET);
assertHttpMethod("POST / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_POST); assertHttpMethod("POST / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_POST);
assertHttpMethod("PUT / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_PUT); assertHttpMethod("PUT / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_PUT);
assertHttpMethod("HEAD / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_HEAD); assertHttpMethod("HEAD / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_HEAD);
assertHttpMethod("DELETE / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_DELETE); assertHttpMethod("DELETE / HTTP/1.1\r\n", HttpHeaders.HTTP_METHOD_DELETE);
} }
private void assertHttpMethod(String httpRequest, int httpMethod) throws UnsupportedEncodingException { private void assertHttpMethod(String httpRequest, int httpMethod) throws UnsupportedEncodingException {
byte[] source = httpRequest.getBytes("UTF-8"); byte[] source = httpRequest.getBytes("UTF-8");
HttpHeaders httpHeaders = new HttpHeaders(); HttpHeaders httpHeaders = new HttpHeaders();
HttpUtil.resolveHttpMethod(source, 0, httpHeaders); HttpUtil.resolveHttpMethod(source, 0, httpHeaders);
assertEquals(httpMethod, httpHeaders.httpMethod); assertEquals(httpMethod, httpHeaders.httpMethod);
} }
@Test
public void testParseHttpRequest() throws UnsupportedEncodingException {
String httpRequest = "GET / HTTP/1.1\r\n\r\n";
byte[] source = httpRequest.getBytes("UTF-8");
HttpHeaders httpHeaders = new HttpHeaders();
@Test HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders);
public void testParseHttpRequest() throws UnsupportedEncodingException {
String httpRequest =
"GET / HTTP/1.1\r\n\r\n";
byte[] source = httpRequest.getBytes("UTF-8"); assertEquals(0, httpHeaders.contentLength);
HttpHeaders httpHeaders = new HttpHeaders();
HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders); httpRequest = "GET / HTTP/1.1\r\n" + "Content-Length: 5\r\n" + "\r\n1234";
source = httpRequest.getBytes("UTF-8");
assertEquals(0, httpHeaders.contentLength); assertEquals(-1, HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders));
assertEquals(5, httpHeaders.contentLength);
httpRequest = httpRequest = "GET / HTTP/1.1\r\n" + "Content-Length: 5\r\n" + "\r\n12345";
"GET / HTTP/1.1\r\n" + source = httpRequest.getBytes("UTF-8");
"Content-Length: 5\r\n" +
"\r\n1234";
source = httpRequest.getBytes("UTF-8");
assertEquals(-1, HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders)); assertEquals(42, HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders));
assertEquals(5, httpHeaders.contentLength); assertEquals(5, httpHeaders.contentLength);
httpRequest = "GET / HTTP/1.1\r\n" + "Content-Length: 5\r\n" + "\r\n12345" + "GET / HTTP/1.1\r\n" + "Content-Length: 5\r\n" + "\r\n12345";
httpRequest = source = httpRequest.getBytes("UTF-8");
"GET / HTTP/1.1\r\n" +
"Content-Length: 5\r\n" +
"\r\n12345";
source = httpRequest.getBytes("UTF-8");
assertEquals(42, HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders)); assertEquals(42, HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders));
assertEquals(5, httpHeaders.contentLength); assertEquals(5, httpHeaders.contentLength);
assertEquals(37, httpHeaders.bodyStartIndex);
assertEquals(42, httpHeaders.bodyEndIndex);
httpRequest = }
"GET / HTTP/1.1\r\n" + }
"Content-Length: 5\r\n" +
"\r\n12345" +
"GET / HTTP/1.1\r\n" +
"Content-Length: 5\r\n" +
"\r\n12345";
source = httpRequest.getBytes("UTF-8");
assertEquals(42, HttpUtil.parseHttpRequest(source, 0, source.length, httpHeaders));
assertEquals(5, httpHeaders.contentLength);
assertEquals(37, httpHeaders.bodyStartIndex);
assertEquals(42, httpHeaders.bodyEndIndex);
}
}