Upgrade to rest express netty 4

.gitignore

@@ -3,3 +3,4 @@
 target/
 .settings/
 *.iml
+.idea/

README.md

@@ -5,4 +5,4 @@ A few examples to illustrate how RestExpress works.
 
 * echo - An echo service with no database back-end.
 * blogging - A blogging service with a MongoDB back-end.
-* benchmark - ?
+* benchmark - A kickstart project for creating a simple RestExpress project

benchmark/pom.xml

@@ -13,14 +13,14 @@
 	<url>https://github.com/RestExpress/RestExpress-Examples</url>
 	<groupId>org.restexpress.examples</groupId>
 	<artifactId>restexpress-benchmark-example</artifactId>
-	<version>0.1-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.strategicgains</groupId>
 			<artifactId>RestExpress</artifactId>
-			<version>0.10.4</version>
+			<version>0.11.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

benchmark/src/main/java/com/benchmark/Main.java

@@ -1,6 +1,6 @@
 package com.benchmark;
 
-import org.jboss.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpMethod;
 import org.restexpress.Request;
 import org.restexpress.Response;
 import org.restexpress.RestExpress;

echo/README.md

@@ -8,11 +8,15 @@ The service suite supports the following functionality.
 Echo
 ====
 
-This URL simply sends back the same string that is sent in on the 'echo' query-string parameter. There is no serialization involved in the response. The body is not parsed.
-
 URL: /echo/{delay_ms}
 Methods: GET, PUT, POST, DELETE
 
+GET, DELETE: send back the same string that is sent in on the 'echo' query-string parameter.
+
+PUT, POST: send back the body contents.
+
+There is no serialization involved in the response. The body is not parsed.
+
 Success
 =======
 

echo/pom.xml

@@ -13,14 +13,14 @@
 	<url>https://github.com/RestExpress/RestExpress-Examples</url>
 	<groupId>org.restexpress.examples</groupId>
 	<artifactId>restexpress-echo-example</artifactId>
-	<version>0.1-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.strategicgains</groupId>
 			<artifactId>RestExpress</artifactId>
-			<version>0.10.5</version>
+			<version>0.11.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

echo/src/jmeter/README.md

@@ -0,0 +1,11 @@
+RestExpress Test Plan.jmx
+=========================
+
+Simple performance tests for GET Echo and Success requests.
+
+RestExpress Test Plan v2.jmx
+============================
+
+Tests added to decode GZIP data and DEFLATE data for PUT Echo requests.
+
+v2 is compatible with JMeter  2.11, but it is not compatible with JMeter 2.8.

echo/src/main/java/com/echo/controller/EchoController.java

@@ -1,6 +1,6 @@
 package com.echo.controller;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ByteBuf;
 import org.restexpress.Request;
 import org.restexpress.Response;
 
@@ -14,11 +14,16 @@ public class EchoController
     private static final String ECHO_PARAMETER_NOT_FOUND = "'echo' header or query-string parameter not found";
 	private static final String ECHO_HEADER = "echo";
 
-	public ChannelBuffer create(Request request, Response response)
+	public ByteBuf create(Request request, Response response)
 	{
 		delay(request);
 		response.setResponseCreated();
-		return request.getBody();
+
+        // copy the body for the result
+        // do NOT return the ByteBuf directly because is a shared buffer
+        // Netty will release the buffer twice (once for the request and once for the response)
+        // which will result in an IllegalReferenceCountException
+        return request.getBody().copy();
 	}
 
 	public String delete(Request request, Response response)
@@ -40,9 +45,14 @@ public String read(Request request, Response response)
 		return echo;
 	}
 
-	public ChannelBuffer update(Request request, Response response)
+	public ByteBuf update(Request request, Response response)
 	{
 		delay(request);
-		return request.getBody();
+
+        // copy the body for the result
+        // do NOT return the ByteBuf directly because is a shared buffer
+        // Netty will release the buffer twice (once for the request and once for the response)
+        // which will result in an IllegalReferenceCountException
+        return request.getBody().copy();
 	}
 }