rename typesystem module package to o.a.h.metadata

typesystem/src/main/java/org/apache/metadata/IInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/IInstance.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 /**
  * Represents a Struct or Trait or Object.

typesystem/src/main/java/org/apache/metadata/IReferenceableInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/IReferenceableInstance.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.Id;
 
 /**
  * Represents and instance of a ClassType. These have identity.

typesystem/src/main/java/org/apache/metadata/IStruct.java → typesystem/src/main/java/org/apache/hadoop/metadata/IStruct.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 /**
  * A marker interface for StructType and TraitType instances.

typesystem/src/main/java/org/apache/metadata/ITypedInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/ITypedInstance.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
-import org.apache.metadata.types.FieldMapping;
+import org.apache.hadoop.metadata.types.FieldMapping;
 
 /**
  * An instance whose structure is associated with a IDataType.

typesystem/src/main/java/org/apache/metadata/ITypedReferenceableInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/ITypedReferenceableInstance.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 public interface ITypedReferenceableInstance extends ITypedInstance, IReferenceableInstance {
 }

typesystem/src/main/java/org/apache/metadata/ITypedStruct.java → typesystem/src/main/java/org/apache/hadoop/metadata/ITypedStruct.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 public interface ITypedStruct extends IStruct, ITypedInstance {
 }

typesystem/src/main/java/org/apache/metadata/MetadataException.java → typesystem/src/main/java/org/apache/hadoop/metadata/MetadataException.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 public class MetadataException extends Exception {
 

typesystem/src/main/java/org/apache/metadata/MetadataService.java → typesystem/src/main/java/org/apache/hadoop/metadata/MetadataService.java

@@ -17,10 +17,10 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
-import org.apache.metadata.storage.IRepository;
-import org.apache.metadata.types.TypeSystem;
+import org.apache.hadoop.metadata.storage.IRepository;
+import org.apache.hadoop.metadata.types.TypeSystem;
 
 public class MetadataService {
 

typesystem/src/main/java/org/apache/metadata/Referenceable.java → typesystem/src/main/java/org/apache/hadoop/metadata/Referenceable.java

@@ -16,11 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.Id;
 
 import java.util.Map;
 

typesystem/src/main/java/org/apache/metadata/Struct.java → typesystem/src/main/java/org/apache/hadoop/metadata/Struct.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 import java.util.HashMap;
 import java.util.Map;

typesystem/src/main/java/org/apache/metadata/bridge/Bridge.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/Bridge.java

-package org.apache.metadata.bridge;
+package org.apache.hadoop.metadata.bridge;
 
 import java.util.ArrayList;
 
-import org.apache.metadata.types.StructType;
-import org.apache.metadata.types.StructTypeDefinition;
+import org.apache.hadoop.metadata.types.StructType;
+import org.apache.hadoop.metadata.types.StructTypeDefinition;
 	/*
 	 * Interface for creating Bridges
 	 */

typesystem/src/main/java/org/apache/metadata/bridge/BridgeException.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/BridgeException.java

-package org.apache.metadata.bridge;
+package org.apache.hadoop.metadata.bridge;
 
 public class BridgeException extends Exception {
 

typesystem/src/main/java/org/apache/metadata/bridge/BridgeListener.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/BridgeListener.java

-package org.apache.metadata.bridge;
+package org.apache.hadoop.metadata.bridge;
 
 public class BridgeListener {
 	/*

typesystem/src/main/java/org/apache/metadata/bridge/BridgeLoad.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/BridgeLoad.java

-package org.apache.metadata.bridge;
+package org.apache.hadoop.metadata.bridge;
 
 public class BridgeLoad {
 	/*

typesystem/src/main/java/org/apache/metadata/bridge/BridgeManager.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/BridgeManager.java

-package org.apache.metadata.bridge;
+package org.apache.hadoop.metadata.bridge;
 	/*
 	 * This will be the primary service for the Bridges (Will handle pushing type definitions into the type system and pushing entities to the repository system for Bridges)
 	 */
 
-import org.apache.metadata.ITypedStruct;
-import org.apache.metadata.types.TypeSystem;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.types.TypeSystem;
 
 import com.google.gson.JsonObject;
 

typesystem/src/main/java/org/apache/metadata/bridge/hive/HiveBridge.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/hive/HiveBridge.java

@@ -16,15 +16,20 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.bridge.hive;
+package org.apache.hadoop.metadata.bridge.hive;
 
 import java.util.ArrayList;
 
-import org.apache.metadata.bridge.Bridge;
-import org.apache.metadata.bridge.BridgeLoad;
-import org.apache.metadata.types.AttributeDefinition;
-import org.apache.metadata.types.Multiplicity;
-import org.apache.metadata.types.StructTypeDefinition;
+import org.apache.hadoop.metadata.bridge.Bridge;
+import org.apache.hadoop.metadata.bridge.BridgeLoad;
+import org.apache.hadoop.metadata.types.AttributeDefinition;
+import org.apache.hadoop.metadata.types.Multiplicity;
+import org.apache.hadoop.metadata.types.StructTypeDefinition;
+import org.apache.hadoop.metadata.bridge.Bridge;
+import org.apache.hadoop.metadata.bridge.BridgeLoad;
+import org.apache.hadoop.metadata.types.AttributeDefinition;
+import org.apache.hadoop.metadata.types.Multiplicity;
+import org.apache.hadoop.metadata.types.StructTypeDefinition;
 
 public class HiveBridge implements Bridge {
 	

typesystem/src/main/java/org/apache/metadata/bridge/hive/HiveMetaImporter.java → typesystem/src/main/java/org/apache/hadoop/metadata/bridge/hive/HiveMetaImporter.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.bridge.hive;
+package org.apache.hadoop.metadata.bridge.hive;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
@@ -27,10 +27,10 @@ import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Table;
 import org.apache.hadoop.hive.metastore.api.UnknownDBException;
 import org.apache.hadoop.hive.metastore.api.UnknownTableException;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.MetadataService;
-import org.apache.metadata.Struct;
-import org.apache.metadata.types.StructType;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataService;
+import org.apache.hadoop.metadata.Struct;
+import org.apache.hadoop.metadata.types.StructType;
 import org.apache.thrift.TException;
 /*
  * Initial pass at one time importer TODO - needs re-write

typesystem/src/main/java/org/apache/metadata/storage/DiscoverInstances.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/DiscoverInstances.java

@@ -16,15 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
-import org.apache.metadata.IReferenceableInstance;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.storage.RepositoryException;
-import org.apache.metadata.storage.memory.MemRepository;
-import org.apache.metadata.types.DataTypes;
-import org.apache.metadata.types.ObjectGraphWalker;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.DataTypes;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.storage.memory.MemRepository;
+import org.apache.hadoop.metadata.types.DataTypes;
+import org.apache.hadoop.metadata.types.ObjectGraphWalker;
 
 import java.util.HashMap;
 import java.util.Map;

typesystem/src/main/java/org/apache/metadata/storage/DownCastStructInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/DownCastStructInstance.java

@@ -16,11 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage;
-
-import org.apache.metadata.IStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.types.DownCastFieldMapping;
+package org.apache.hadoop.metadata.storage;
+
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.DownCastFieldMapping;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.DownCastFieldMapping;
 
 public class DownCastStructInstance implements IStruct {
 

typesystem/src/main/java/org/apache/metadata/storage/IRepository.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/IRepository.java

@@ -15,9 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
-import org.apache.metadata.*;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.ITypedInstance;
+import org.apache.hadoop.metadata.ITypedReferenceableInstance;
 
 import java.text.DateFormat;
 

typesystem/src/main/java/org/apache/metadata/storage/Id.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/Id.java

@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.metadata.IReferenceableInstance;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.ITypedReferenceableInstance;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.types.FieldMapping;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.FieldMapping;
 
 public class Id implements ITypedReferenceableInstance {
 

typesystem/src/main/java/org/apache/metadata/storage/MapIds.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/MapIds.java

@@ -16,14 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IReferenceableInstance;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.types.DataTypes;
-import org.apache.metadata.types.ObjectGraphWalker;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.DataTypes;
+import org.apache.hadoop.metadata.types.ObjectGraphWalker;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.DataTypes;
+import org.apache.hadoop.metadata.types.ObjectGraphWalker;
 
 import java.util.Map;
 

typesystem/src/main/java/org/apache/metadata/storage/ReferenceableInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/ReferenceableInstance.java

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.ITypedReferenceableInstance;
-import org.apache.metadata.ITypedStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.types.FieldMapping;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedReferenceableInstance;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.types.FieldMapping;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

typesystem/src/main/java/org/apache/metadata/storage/RepositoryException.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/RepositoryException.java

-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
 
 public class RepositoryException extends MetadataException {
 

typesystem/src/main/java/org/apache/metadata/storage/StructInstance.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/StructInstance.java

@@ -15,15 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.storage;
+package org.apache.hadoop.metadata.storage;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.ITypedStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.MetadataService;
-import org.apache.metadata.types.*;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.types.*;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataService;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

typesystem/src/main/java/org/apache/metadata/storage/memory/AttributeStores.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/memory/AttributeStores.java

@@ -16,15 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage.memory;
+package org.apache.hadoop.metadata.storage.memory;
 
 import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
-import org.apache.metadata.ITypedInstance;
-import org.apache.metadata.storage.RepositoryException;
-import org.apache.metadata.storage.StructInstance;
-import org.apache.metadata.types.AttributeInfo;
-import org.apache.metadata.types.FieldMapping;
-import org.apache.metadata.types.IConstructableType;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.ITypedInstance;
+import org.apache.hadoop.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.types.AttributeInfo;
+import org.apache.hadoop.metadata.types.FieldMapping;
+import org.apache.hadoop.metadata.types.IConstructableType;
 
 import java.util.HashMap;
 import java.util.List;

typesystem/src/main/java/org/apache/metadata/storage/memory/HierarchicalTypeStore.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/memory/HierarchicalTypeStore.java

@@ -16,16 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage.memory;
+package org.apache.hadoop.metadata.storage.memory;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.ITypedReferenceableInstance;
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.storage.RepositoryException;
-import org.apache.metadata.types.AttributeInfo;
-import org.apache.metadata.types.HierarchicalType;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.ITypedReferenceableInstance;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.types.AttributeInfo;
+import org.apache.hadoop.metadata.types.HierarchicalType;
 
 import java.util.List;
 import java.util.Map;

typesystem/src/main/java/org/apache/metadata/storage/memory/IAttributeStore.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/memory/IAttributeStore.java

-package org.apache.metadata.storage.memory;
+package org.apache.hadoop.metadata.storage.memory;
 
 
-import org.apache.metadata.ITypedInstance;
-import org.apache.metadata.storage.RepositoryException;
-import org.apache.metadata.storage.StructInstance;
-import org.apache.metadata.types.IConstructableType;
+import org.apache.hadoop.metadata.ITypedInstance;
+import org.apache.hadoop.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.types.IConstructableType;
 
 public interface IAttributeStore {
     /**

typesystem/src/main/java/org/apache/metadata/storage/memory/MemRepository.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/memory/MemRepository.java

@@ -16,11 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage.memory;
+package org.apache.hadoop.metadata.storage.memory;
 
-import org.apache.metadata.*;
-import org.apache.metadata.storage.*;
-import org.apache.metadata.types.*;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.ITypedReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.*;
+import org.apache.hadoop.metadata.types.ClassType;
+import org.apache.hadoop.metadata.types.Multiplicity;
+import org.apache.hadoop.metadata.types.ObjectGraphWalker;
+import org.apache.hadoop.metadata.types.TypeSystem;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -87,7 +92,7 @@ public class MemRepository implements IRepository {
      *
      * @param i
      * @return
-     * @throws RepositoryException
+     * @throws org.apache.hadoop.metadata.storage.RepositoryException
      */
     public ITypedReferenceableInstance create(IReferenceableInstance i) throws RepositoryException {
 

typesystem/src/main/java/org/apache/metadata/storage/memory/StructStore.java → typesystem/src/main/java/org/apache/hadoop/metadata/storage/memory/StructStore.java

@@ -16,17 +16,21 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.storage.memory;
+package org.apache.hadoop.metadata.storage.memory;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.storage.RepositoryException;
-import org.apache.metadata.storage.StructInstance;
-import org.apache.metadata.types.AttributeInfo;
-import org.apache.metadata.types.HierarchicalType;
-import org.apache.metadata.types.IConstructableType;
-import org.apache.metadata.types.StructType;
+import org.apache.hadoop.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.types.IConstructableType;
+import org.apache.hadoop.metadata.types.StructType;
+import org.apache.hadoop.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.types.AttributeInfo;
+import org.apache.hadoop.metadata.types.HierarchicalType;
+import org.apache.hadoop.metadata.types.IConstructableType;
+import org.apache.hadoop.metadata.types.StructType;
 
 import java.util.Collection;
 import java.util.List;

typesystem/src/main/java/org/apache/metadata/types/AbstractDataType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/AbstractDataType.java

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
 
 import java.io.IOException;
 

typesystem/src/main/java/org/apache/metadata/types/AttributeDefinition.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/AttributeDefinition.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 public final class AttributeDefinition {
 

typesystem/src/main/java/org/apache/metadata/types/AttributeInfo.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/AttributeInfo.java

@@ -17,9 +17,10 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
 
 public class AttributeInfo {
     public final String name;

typesystem/src/main/java/org/apache/metadata/types/ClassType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/ClassType.java

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.*;
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.storage.ReferenceableInstance;
-import org.apache.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.*;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.ReferenceableInstance;
+import org.apache.hadoop.metadata.storage.StructInstance;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -69,7 +69,7 @@ public class ClassType extends HierarchicalType<ClassType, IReferenceableInstanc
     }
 
     protected Id getId(Object val) throws MetadataException {
-        if ( val instanceof Referenceable ) {
+        if ( val instanceof Referenceable) {
             return ((Referenceable)val).getId();
         }
         throw new MetadataException(String.format("Cannot get id from class %s", val.getClass()));

typesystem/src/main/java/org/apache/metadata/types/DataTypes.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/DataTypes.java

@@ -16,18 +16,22 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableCollection.Builder;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import org.apache.metadata.IReferenceableInstance;
-import org.apache.metadata.storage.IRepository;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.MetadataService;
-import org.apache.metadata.storage.Id;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataService;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.storage.IRepository;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataService;
+import org.apache.hadoop.metadata.storage.Id;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

typesystem/src/main/java/org/apache/metadata/types/DownCastFieldMapping.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/DownCastFieldMapping.java

@@ -16,12 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.storage.DownCastStructInstance;
-import org.apache.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.DownCastStructInstance;
+import org.apache.hadoop.metadata.storage.StructInstance;
 
 public class DownCastFieldMapping {
 

typesystem/src/main/java/org/apache/metadata/types/FieldMapping.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/FieldMapping.java

@@ -15,20 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.*;
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.storage.ReferenceableInstance;
-import org.apache.metadata.storage.StructInstance;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+package org.apache.hadoop.metadata.types;
+
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataService;
+import org.apache.hadoop.metadata.storage.Id;
 import java.util.Map;
 
 public class FieldMapping {
@@ -83,7 +76,7 @@ public class FieldMapping {
             AttributeInfo i = e.getValue();
             Object aVal = s.get(attrName);
             TypeUtils.outputVal(attrName + " : ", buf, fieldPrefix);
-            if ( aVal != null && aVal instanceof Id ) {
+            if ( aVal != null && aVal instanceof Id) {
                 TypeUtils.outputVal(aVal.toString(), buf, "");
             } else {
                 i.dataType().output(aVal, buf, fieldPrefix);

typesystem/src/main/java/org/apache/metadata/types/HierarchicalType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/HierarchicalType.java

@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.storage.DownCastStructInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.DownCastStructInstance;
 
 import java.util.*;
 

typesystem/src/main/java/org/apache/metadata/types/HierarchicalTypeDefinition.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/HierarchicalTypeDefinition.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 

typesystem/src/main/java/org/apache/metadata/types/IConstructableType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/IConstructableType.java

-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 
-import org.apache.metadata.ITypedInstance;
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.ITypedInstance;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.ITypedInstance;
+import org.apache.hadoop.metadata.MetadataException;
 
 import java.util.List;
 

typesystem/src/main/java/org/apache/metadata/types/IDataType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/IDataType.java

@@ -15,17 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.types.DataTypes.TypeCategory;
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.types.DataTypes.TypeCategory;
+import org.apache.hadoop.metadata.MetadataException;
 
 import java.util.Map;
 
 public interface IDataType<T> {
     String getName();
     T convert(Object val, Multiplicity m) throws MetadataException;
-    TypeCategory getTypeCategory();
+    DataTypes.TypeCategory getTypeCategory();
     void output(T val, Appendable buf, String prefix) throws MetadataException;
 }

typesystem/src/main/java/org/apache/metadata/types/Multiplicity.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/Multiplicity.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 public final class Multiplicity {
 

typesystem/src/main/java/org/apache/metadata/types/ObjectGraphTraversal.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/ObjectGraphTraversal.java

@@ -16,14 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IReferenceableInstance;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.storage.Id;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.Id;
 
 
 import java.util.*;

typesystem/src/main/java/org/apache/metadata/types/ObjectGraphWalker.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/ObjectGraphWalker.java

-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IReferenceableInstance;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.storage.RepositoryException;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.IReferenceableInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.RepositoryException;
 
 import java.util.*;
 

typesystem/src/main/java/org/apache/metadata/types/StructType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/StructType.java

@@ -15,15 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.ITypedStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.Struct;
-import org.apache.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.Struct;
+import org.apache.hadoop.metadata.storage.StructInstance;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

typesystem/src/main/java/org/apache/metadata/types/StructTypeDefinition.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/StructTypeDefinition.java

-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 

typesystem/src/main/java/org/apache/metadata/types/TraitType.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/TraitType.java

@@ -16,12 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.ITypedStruct;
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
 
 import java.util.List;
 import java.util.Map;

typesystem/src/main/java/org/apache/metadata/types/TypeSystem.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/TypeSystem.java

@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
 
 import java.lang.reflect.Constructor;
 import java.util.*;

typesystem/src/main/java/org/apache/metadata/types/TypeUtils.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/TypeUtils.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
 
 import java.io.IOException;
 import java.util.ArrayList;

typesystem/src/main/java/org/apache/metadata/types/TypedStructHandler.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/TypedStructHandler.java

@@ -16,17 +16,24 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.metadata.IStruct;
-import org.apache.metadata.ITypedStruct;
-import org.apache.metadata.MetadataException;
-import org.apache.metadata.Struct;
-import org.apache.metadata.storage.Id;
-import org.apache.metadata.storage.ReferenceableInstance;
-import org.apache.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.Struct;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.ReferenceableInstance;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.IStruct;
+import org.apache.hadoop.metadata.ITypedStruct;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.Struct;
+import org.apache.hadoop.metadata.storage.Id;
+import org.apache.hadoop.metadata.storage.ReferenceableInstance;
+import org.apache.hadoop.metadata.storage.StructInstance;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

typesystem/src/main/java/org/apache/metadata/types/ValueConversionException.java → typesystem/src/main/java/org/apache/hadoop/metadata/types/ValueConversionException.java

@@ -15,9 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.metadata.types;
+package org.apache.hadoop.metadata.types;
 
-import org.apache.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
+import org.apache.hadoop.metadata.MetadataException;
 
 public class ValueConversionException  extends MetadataException {
 

typesystem/src/main/scala/org/apache/metadata/cli/Console.scala → typesystem/src/main/scala/org/apache/hadoop/metadata/cli/Console.scala

@@ -16,12 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.cli
+package org.apache.hadoop.metadata.cli
 
-import org.apache.metadata.MetadataService
-import org.apache.metadata.MetadataService
-import org.apache.metadata.storage.memory.MemRepository
-import org.apache.metadata.types.TypeSystem
+import org.apache.hadoop.metadata.MetadataService
+import org.apache.hadoop.metadata.storage.memory.MemRepository
+import org.apache.hadoop.metadata.types.TypeSystem
 
 import scala.reflect.io.File
 import scala.tools.nsc.Settings
@@ -56,7 +55,7 @@ class SampleILoop extends ILoop {
       intp.addImports("org.json4s.native.Serialization.{read, write => swrite}")
       intp.addImports("org.json4s._")
       intp.addImports("org.json4s.native.JsonMethods._")
-      intp.addImports("org.apache.metadata.dsl._")
+      intp.addImports("org.apache.hadoop.metadata.dsl._")
       intp.bindValue("service", ms)
       //intp.bindValue("cp", intp.compilerClasspath)
     }

typesystem/src/main/scala/org/apache/metadata/dsl/DynamicTypedStruct.scala → typesystem/src/main/scala/org/apache/hadoop/metadata/dsl/DynamicTypedStruct.scala

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.dsl
+package org.apache.hadoop.metadata.dsl
 
-import org.apache.metadata.{ITypedStruct, MetadataService}
-import org.apache.metadata.storage.StructInstance
-import org.apache.metadata.types.{StructType, TypeSystem}
+import org.apache.hadoop.metadata.{ITypedStruct, MetadataService}
+import org.apache.hadoop.metadata.storage.StructInstance
+import org.apache.hadoop.metadata.types.{StructType, TypeSystem}
 import scala.language.dynamics
 
 class DynamicTypedStruct(val ts : ITypedStruct) extends Dynamic {

typesystem/src/main/scala/org/apache/metadata/dsl/package.scala → typesystem/src/main/scala/org/apache/hadoop/metadata/dsl/package.scala

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.metadata
+package org.apache.hadoop.metadata
 
-import org.apache.metadata.json.{BigIntegerSerializer, BigDecimalSerializer, TypedStructSerializer, Serialization}
-import org.apache.metadata.storage.StructInstance
-import org.apache.metadata.types._
+import org.apache.hadoop.metadata.json.{BigIntegerSerializer, BigDecimalSerializer, TypedStructSerializer, Serialization}
+import org.apache.hadoop.metadata.storage.StructInstance
+import org.apache.hadoop.metadata.types._
 
 import scala.collection.JavaConverters._
 import org.json4s._

typesystem/src/main/scala/org/apache/metadata/json/Serialization.scala → typesystem/src/main/scala/org/apache/hadoop/metadata/json/Serialization.scala

@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.json
+package org.apache.hadoop.metadata.json
 
 import org.apache.jute.compiler.JLong
-import org.apache.metadata.types.DataTypes.{MapType, TypeCategory, ArrayType}
-import org.apache.metadata._
-import org.apache.metadata.types._
-import org.apache.metadata.storage.Id
+import org.apache.hadoop.metadata.types.DataTypes.{MapType, TypeCategory, ArrayType}
+import org.apache.hadoop.metadata._
+import org.apache.hadoop.metadata.types._
+import org.apache.hadoop.metadata.storage.Id
 import org.json4s.JsonAST.JInt
 import org.json4s._
 import org.json4s.native.Serialization.{read, write => swrite}

typesystem/src/test/java/org/apache/metadata/BaseTest.java → typesystem/src/test/java/org/apache/hadoop/metadata/BaseTest.java

@@ -16,13 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.apache.metadata.storage.memory.MemRepository;
-import org.apache.metadata.types.*;
+import org.apache.hadoop.metadata.types.AttributeDefinition;
+import org.apache.hadoop.metadata.types.ClassType;
+import org.apache.hadoop.metadata.types.DataTypes;
+import org.apache.hadoop.metadata.types.StructType;
+import org.apache.hadoop.metadata.storage.memory.MemRepository;
+import org.apache.hadoop.metadata.types.*;
 import org.junit.Before;
 
 import java.math.BigDecimal;

typesystem/src/test/java/org/apache/metadata/ClassTest.java → typesystem/src/test/java/org/apache/hadoop/metadata/ClassTest.java

-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.metadata.types.*;
+import org.apache.hadoop.metadata.types.ClassType;
+import org.apache.hadoop.metadata.types.*;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

typesystem/src/test/java/org/apache/metadata/StructTest.java → typesystem/src/test/java/org/apache/hadoop/metadata/StructTest.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
-import org.apache.metadata.storage.StructInstance;
-import org.apache.metadata.types.*;
+import org.apache.hadoop.metadata.storage.StructInstance;
+import org.apache.hadoop.metadata.types.*;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

typesystem/src/test/java/org/apache/metadata/TraitTest.java → typesystem/src/test/java/org/apache/hadoop/metadata/TraitTest.java

-package org.apache.metadata;
+package org.apache.hadoop.metadata;
 
 import com.google.common.collect.ImmutableList;
 import org.junit.Assert;
-import org.apache.metadata.types.*;
+import org.apache.hadoop.metadata.types.*;
 import org.junit.Before;
 import org.junit.Test;
 

typesystem/src/test/scala/org/apache/metadata/dsl/DSLTest.scala → typesystem/src/test/scala/org/apache/hadoop/metadata/dsl/DSLTest.scala

@@ -16,17 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.dsl
+package org.apache.hadoop.metadata.dsl
 
-import org.apache.metadata.hive.HiveMockMetadataService
-import org.apache.metadata.json.{BigIntegerSerializer, BigDecimalSerializer, TypedStructSerializer}
-import org.apache.metadata.storage.StructInstance
-import org.apache.metadata.{Struct, BaseTest}
-import org.apache.metadata.types.{IDataType, Multiplicity, StructType}
+import org.apache.hadoop.metadata.hive.HiveMockMetadataService
+import org.apache.hadoop.metadata.json.{BigIntegerSerializer, BigDecimalSerializer, TypedStructSerializer}
+import org.apache.hadoop.metadata.storage.StructInstance
+import org.apache.hadoop.metadata.{Struct, BaseTest}
+import org.apache.hadoop.metadata.types.{IDataType, Multiplicity, StructType}
 import org.json4s.NoTypeHints
 import org.json4s.native.Serialization._
 import org.junit.{Test, Before}
-import org.apache.metadata.dsl._
+import org.apache.hadoop.metadata.dsl._
 import org.json4s.native.JsonMethods._
 import org.junit.Assert
 

typesystem/src/test/scala/org/apache/metadata/hive/HiveMockMetadataService.scala → typesystem/src/test/scala/org/apache/hadoop/metadata/hive/HiveMockMetadataService.scala

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.hive
+package org.apache.hadoop.metadata.hive
 
 object HiveMockMetadataService {
 

typesystem/src/test/scala/org/apache/metadata/json/SerializationTest.scala → typesystem/src/test/scala/org/apache/hadoop/metadata/json/SerializationTest.scala

@@ -16,12 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.metadata.json
+package org.apache.hadoop.metadata.json
 
 import com.google.common.collect.ImmutableList
-import org.apache.metadata._
-import org.apache.metadata.storage.{ReferenceableInstance, StructInstance}
-import org.apache.metadata.types._
+import org.apache.hadoop.metadata._
+import org.apache.hadoop.metadata.storage.{ReferenceableInstance, StructInstance}
+import org.apache.hadoop.metadata.types._
+
 import org.json4s.NoTypeHints
 import org.junit.Before
 import org.junit.Test