Merge pull request #81 from shwethags/BUG-36553

addons/hive-bridge/src/main/java/org/apache/hadoop/metadata/hive/bridge/HiveMetaStoreBridge.java

@@ -40,6 +40,7 @@ import org.apache.hadoop.metadata.typesystem.json.Serialization;
 import org.apache.hadoop.metadata.typesystem.persistence.Id;
 import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
 import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -119,8 +120,8 @@ public class HiveMetaStoreBridge {
         if (results.length() == 0) {
             return null;
         } else {
-            ITypedReferenceableInstance reference = Serialization.fromJson(results.get(0).toString());
-            return new Referenceable(reference.getId().id, typeName, null);
+            String guid = getGuidFromDSLResponse(results.getJSONObject(0));
+            return new Referenceable(guid, typeName, null);
         }
     }
 
@@ -198,13 +199,16 @@ public class HiveMetaStoreBridge {
             return null;
         } else {
             //There should be just one instance with the given name
-            ITypedReferenceableInstance reference = Serialization.fromJson(results.get(0).toString());
-            String guid = reference.getId().id;
+            String guid = getGuidFromDSLResponse(results.getJSONObject(0));
             LOG.debug("Got reference for table {}.{} = {}", dbRef, tableName, guid);
             return new Referenceable(guid, typeName, null);
         }
     }
 
+    private String getGuidFromDSLResponse(JSONObject jsonObject) throws JSONException {
+        return jsonObject.getJSONObject("$id$").getString("id");
+    }
+
     private Referenceable getSDForTable(Referenceable dbRef, String tableName) throws Exception {
         Referenceable tableRef = getTableReference(dbRef, tableName);
         if (tableRef == null) {
@@ -212,7 +216,7 @@ public class HiveMetaStoreBridge {
         }
 
         MetadataServiceClient dgiClient = getMetadataServiceClient();
-        ITypedReferenceableInstance tableInstance = dgiClient.getEntity(tableRef.getId().id);
+        Referenceable tableInstance = dgiClient.getEntity(tableRef.getId().id);
         Id sdId = (Id) tableInstance.get("sd");
         return new Referenceable(sdId.id, sdId.getTypeName(), null);
     }
@@ -455,10 +459,6 @@ public class HiveMetaStoreBridge {
         } else {
             LOG.info("Hive data model is already registered!");
         }
-
-        //todo remove when fromJson(entityJson) is supported on client
-        dataModelGenerator.createDataModel();
-        TypeSystem.getInstance().defineTypes(dataModelGenerator.getTypesDef());
     }
 
     public static void main(String[] argv) throws Exception {

client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java

@@ -26,6 +26,8 @@ import com.sun.jersey.client.urlconnection.URLConnectionClientHandler;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.hadoop.metadata.security.SecureClientUtils;
 import org.apache.hadoop.metadata.typesystem.ITypedReferenceableInstance;
+import org.apache.hadoop.metadata.typesystem.Referenceable;
+import org.apache.hadoop.metadata.typesystem.json.InstanceSerialization;
 import org.apache.hadoop.metadata.typesystem.json.Serialization;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
@@ -176,11 +178,11 @@ public class MetadataServiceClient {
      * @return result json object
      * @throws MetadataServiceException
      */
-    public ITypedReferenceableInstance getEntity(String guid) throws MetadataServiceException {
+    public Referenceable getEntity(String guid) throws MetadataServiceException {
         JSONObject jsonResponse = callAPI(API.GET_ENTITY, null, guid);
         try {
             String entityInstanceDefinition = jsonResponse.getString(MetadataServiceClient.RESULTS);
-            return Serialization.fromJson(entityInstanceDefinition);
+            return InstanceSerialization.fromJsonReferenceable(entityInstanceDefinition, true);
         } catch (JSONException e) {
             throw new MetadataServiceException(e);
         }

repository/src/main/java/org/apache/hadoop/metadata/services/DefaultMetadataService.java

@@ -195,7 +195,7 @@ public class DefaultMetadataService implements MetadataService {
         Preconditions.checkNotNull(guid, "guid cannot be null");
 
         final ITypedReferenceableInstance instance = repository.getEntityDefinition(guid);
-        return Serialization$.MODULE$.toJson(instance);
+        return InstanceSerialization.toJson(instance, true);
     }
 
     /**

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

@@ -28,6 +28,8 @@ import org.apache.hadoop.metadata.typesystem.TypesDef;
 import org.apache.hadoop.metadata.typesystem.json.InstanceSerialization;
 import org.apache.hadoop.metadata.typesystem.json.TypesSerialization;
 import org.apache.hadoop.metadata.typesystem.persistence.Id;
+import org.apache.hadoop.metadata.typesystem.types.ClassType;
+import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
 import org.codehaus.jettison.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -59,8 +61,11 @@ public abstract class BaseResourceIT {
     }
 
     protected void createType(TypesDef typesDef) throws Exception {
-        String typesAsJSON = TypesSerialization.toJson(typesDef);
-        createType(typesAsJSON);
+        HierarchicalTypeDefinition<ClassType> sampleType = typesDef.classTypesAsJavaList().get(0);
+        if (serviceClient.getType(sampleType.typeName) == null ) {
+            String typesAsJSON = TypesSerialization.toJson(typesDef);
+            createType(typesAsJSON);
+        }
     }
 
     protected void createType(String typesAsJSON) throws Exception {

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

@@ -148,6 +148,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
         final String definition = response.getString(MetadataServiceClient.RESULTS);
         Assert.assertNotNull(definition);
         LOG.debug("tableInstanceAfterGet = " + definition);
+        InstanceSerialization.fromJsonReferenceable(definition, true);
     }
 
     private ClientResponse addProperty(String guid, String property, String value) {