Fixed json parsing issues - guid is now extracted from the JSON payload

webapp/pom.xml

@@ -132,6 +132,11 @@
 			<artifactId>guice-servlet</artifactId>
 			<version>3.0</version>
 		</dependency>
+        <dependency>
+        	<groupId>com.google.code.gson</groupId>
+        	<artifactId>gson</artifactId>
+        	<version>2.3.1</version>
+        </dependency>
 		<dependency>
 			<groupId>com.sun.jersey.contribs</groupId>
 			<artifactId>jersey-guice</artifactId>
@@ -206,15 +211,15 @@
 					<artifactId>keytool-maven-plugin</artifactId>
 					<executions>
 						<execution>
+							<id>clean</id>
 							<phase>generate-resources</phase>
-							<id>clean-server</id>
 							<goals>
 								<goal>clean</goal>
 							</goals>
 						</execution>
 						<execution>
+							<id>genkey</id>
 							<phase>generate-resources</phase>
-							<id>server</id>
 							<goals>
 								<goal>generateKeyPair</goal>
 							</goals>
@@ -251,6 +256,7 @@
 							</connector>
 						</connectors>
 						<webApp>${project.build.directory}/metadata-webapp-${project.version}</webApp>
+						<contextPath>/</contextPath>
 						<useTestClasspath>true</useTestClasspath>
 						<systemProperties>
 							<systemProperty>

webapp/src/test/java/org/apache/hadoop/metadata/web/resources/EntityJerseyResourceIT.java

@@ -18,18 +18,22 @@
 
 package org.apache.hadoop.metadata.web.resources;
 
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import org.json.simple.JSONValue;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+
+import org.json.simple.JSONValue;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
 
 /**
  * Integration tests for Entity Jersey Resource.
@@ -44,6 +48,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
     @Test
     public void testSubmitEntity() {
         String entityStream = getTestEntityJSON();
+        JsonParser parser = new JsonParser();
 
         WebResource resource = service
                 .path("api/metadata/entities/submit")
@@ -54,11 +59,15 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
                 .type(MediaType.APPLICATION_JSON)
                 .method(HttpMethod.POST, ClientResponse.class, entityStream);
         Assert.assertEquals(clientResponse.getStatus(), Response.Status.OK.getStatusCode());
+        
         String response = clientResponse.getEntity(String.class);
         Assert.assertNotNull(response);
+        
+        JsonElement elem = parser.parse(response);
+        String guid = elem.getAsJsonObject().get("GUID").getAsString();
 
         try {
-            Assert.assertNotNull(UUID.fromString(response));
+            Assert.assertNotNull(UUID.fromString(guid));
         } catch (IllegalArgumentException e) {
             Assert.fail("Response is not a guid, " + response);
         }