package com.ideoplex.tutorial;


import cucumber.api.CucumberOptions;
import cucumber.api.testng.AbstractTestNGCucumberTests;

@CucumberOptions(plugin = {"json:target/cucumber-report.json",
                           "html:target/cucumber-report"})
public class CucumberTest extends AbstractTestNGCucumberTests
{
}

...
public class UserMapUnmarshall implements JsonDeserializer<UserMap> {
    private static Gson gson = new Gson();

    @Override
    public UserMap deserialize(JsonElement mapFormat, Type typeOfSrc, JsonDeserializationContext context) {
        Iterator<JsonElement>  iterate = mapFormat.getAsJsonObject()
            .get("data")
            .getAsJsonArray()
            .iterator();

        UserMap  users = new UserMap();
        while( iterate.hasNext() ) {
            JsonObject user     = ((JsonElement) iterate.next()).getAsJsonObject();
            String     email    = user.get("email").getAsString();
            User       add      = new User();
            add.setEmail( email );
            add.setSurname( user.get("surname").getAsString() );
            add.setGivenName( user.get("givenName").getAsString() );
            users.put( email, add );
        }

        return users;
    }
}

diff --git a/src/main/java/com/ideoplex/tutorial/GsonReader.java b/src/main/java/com/ideoplex/tutorial/GsonReader.java
index 144fbde..4e117cc 100644
--- a/src/main/java/com/ideoplex/tutorial/GsonReader.java
+++ b/src/main/java/com/ideoplex/tutorial/GsonReader.java
@@ -28,12 +28,16 @@ import javax.ws.rs.core.MultivaluedMap;
 
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 
 @Provider
 @Consumes(MediaType.APPLICATION_JSON)
 @Singleton
 public class GsonReader<T> implements MessageBodyReader<T> {
+    protected static Gson gson = new GsonBuilder()
+        .registerTypeAdapter(UserMap.class,new UserMapUnmarshall())
+        .create();
  
     @Override
     public boolean isReadable(Class<?> type, Type genericType,
@@ -46,8 +50,7 @@ public class GsonReader<T> implements MessageBodyReader<T> {
             Annotation[] antns, MediaType mt,
             MultivaluedMap<String, String> mm, InputStream in)
             throws IOException, WebApplicationException {
-        Gson g = new Gson();
-        return g.fromJson(_convertStreamToString(in), type);
+        return gson.fromJson(_convertStreamToString(in), type);
     }
  
     private String _convertStreamToString(InputStream inputStream)

diff --git a/src/main/java/com/ideoplex/tutorial/MyResource.java b/src/main/java/com/ideoplex/tutorial/MyResource.java
index a69c8ac..6ef69fb 100644
--- a/src/main/java/com/ideoplex/tutorial/MyResource.java
+++ b/src/main/java/com/ideoplex/tutorial/MyResource.java
@@ -1,8 +1,10 @@
 package com.ideoplex.tutorial;
 
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
@@ -61,6 +63,32 @@ public class MyResource {
         return user;
     }
 
+    @GET
+    @Path("user/get/{email}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User getUser(@PathParam("email") String email) {
+        User  rVal   = users.get(email);
+        if ( rVal == null ) {
+            throw new WebApplicationException(Response
+                                              .status(Response.Status.NOT_FOUND)
+                                              .build());
+        }
+        return rVal;
+    }
+
+    @DELETE
+    @Path("user/delete/{email}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User deleteUser(@PathParam("email") String email) {
+        User  rVal   = users.remove(email);
+        if ( rVal == null ) {
+            throw new WebApplicationException(Response
+                                              .status(Response.Status.NOT_FOUND)
+                                              .build());
+        }
+        return rVal;
+    }
+
     @POST
     @Path("user/post")
     @Consumes(MediaType.APPLICATION_JSON)

Client          client;
WebResource     resource;
ClientResponse  response;

{
    ClientConfig config = new DefaultClientConfig();
    config.getClasses().add(GsonReader.class);
    config.getClasses().add(GsonWriter.class);

    client   = Client.create(config);
}

System.out.println("Verify that " + email + " is not available yet");
resource  = client.resource( url + "/get/" + email );
response  = resource.accept(MediaType.APPLICATION_JSON)
    .get(ClientResponse.class);
assert( response.getStatus() == 404 );

System.out.println("Verify that user/post on " + email + " succeeds");
resource  = client.resource( url + "/post" );
response  = resource.accept(MediaType.APPLICATION_JSON)
    .type(MediaType.APPLICATION_JSON)
    .post(ClientResponse.class,sample);
assert( response.getStatus() == 200 );
User  rVal  = response.getEntity(User.class);
assert( email.equals(rVal.getEmail()) );

System.out.println("Verify that " + email + " is in the userMap");
resource  = client.resource( url + "/map" );
response  = resource.accept(MediaType.APPLICATION_JSON)
    .get(ClientResponse.class);
assert( response.getStatus() == 200 );
UserMap  rVal  = response.getEntity(UserMap.class);
assert( rVal != null );
User     look   = rVal.get(email);
assert( look != null );

System.out.println("Verify that delete on " + email + " succeeds");
resource  = client.resource( url + "/delete/" + email );
response  = resource.accept(MediaType.APPLICATION_JSON)
    .delete(ClientResponse.class);
assert( response.getStatus() == 200 );
User  rVal  = response.getEntity(User.class);
assert( email.equals(rVal.getEmail()) );

diff --git a/src/test/java/com/ideoplex/tutorial/BrowserTest.java b/src/test/java/com/ideoplex/tutorial/BrowserTest.java
index bac07fb..f70c161 100644
--- a/src/test/java/com/ideoplex/tutorial/BrowserTest.java
+++ b/src/test/java/com/ideoplex/tutorial/BrowserTest.java
@@ -76,7 +76,7 @@ public class BrowserTest {
     }
 
     @Parameters({"browser","baseurl","waitajax"})
-    @Test(invocationCount = 2, groups="browser")
+    @Test(invocationCount = 2, dependsOnGroups="client", groups="browser")
     public void userCreate( String browser, String baseurl, String waitajax )
     {
         WebDriver driver = "chrome".equalsIgnoreCase(browser)

diff --git a/src/main/java/com/ideoplex/tutorial/GsonWriter.java b/src/main/java/com/ideoplex/tutorial/GsonWriter.java
index 9ef181d..95a12c3 100644
--- a/src/main/java/com/ideoplex/tutorial/GsonWriter.java
+++ b/src/main/java/com/ideoplex/tutorial/GsonWriter.java
@@ -42,7 +42,6 @@ public class GsonWriter<T> implements MessageBodyWriter<T> {
             MultivaluedMap<String, Object> httpHeaders,
             OutputStream entityStream)
             throws IOException, WebApplicationException {
-        httpHeaders.get("Content-Type").add("charset=UTF-8");
         entityStream.write(gson.toJson(t).getBytes("UTF-8"));
     }