Merge branch 'master' of https://github.com/hortonworks/metadata.git

typesystem/src/main/scala/org/apache/hadoop/metadata/TypesDef.scala

+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.metadata
+
+import org.apache.hadoop.metadata.types._
+
+case class TypesDef(enumTypes: Seq[EnumTypeDefinition],
+                    structTypes: Seq[StructTypeDefinition],
+                    traitTypes: Seq[HierarchicalTypeDefinition[TraitType]],
+                    classTypes: Seq[HierarchicalTypeDefinition[ClassType]])

typesystem/src/main/scala/org/apache/hadoop/metadata/json/TypesSerialization.scala

@@ -19,17 +19,14 @@
 package org.apache.hadoop.metadata.json
 
 import com.google.common.collect.ImmutableList
-import org.apache.hadoop.metadata.MetadataException
+import org.apache.hadoop.metadata.{TypesDef, MetadataException}
 import org.apache.hadoop.metadata.types.DataTypes.{ArrayType, MapType, TypeCategory}
 import org.apache.hadoop.metadata.types._
 import org.json4s.JsonAST.JString
 import org.json4s._
 import org.json4s.native.Serialization._
 
-case class TypesDef(enumTypes: Seq[EnumTypeDefinition],
-                    structTypes: Seq[StructTypeDefinition],
-                    traitTypes: Seq[HierarchicalTypeDefinition[TraitType]],
-                    classTypes: Seq[HierarchicalTypeDefinition[ClassType]])
+
 
 /**
  * Module for serializing to/from Json.

typesystem/src/main/scala/org/apache/hadoop/metadata/tools/simpleserver/MetadataActor.scala

@@ -21,7 +21,7 @@ package org.apache.hadoop.metadata.tools.simpleserver
 import akka.actor._
 import akka.util.Timeout
 import com.google.common.collect.ImmutableList
-import org.apache.hadoop.metadata.{MetadataService, ITypedReferenceableInstance}
+import org.apache.hadoop.metadata.{TypesDef, MetadataService, ITypedReferenceableInstance}
 import org.apache.hadoop.metadata.json._
 import org.apache.hadoop.metadata.storage.memory.MemRepository
 import org.apache.hadoop.metadata.types._

typesystem/src/main/scala/org/apache/hadoop/metadata/tools/simpleserver/RestInterface.scala

@@ -20,8 +20,7 @@ package org.apache.hadoop.metadata.tools.simpleserver
 
 import akka.actor._
 import akka.util.Timeout
-import org.apache.hadoop.metadata.{MetadataService, ITypedReferenceableInstance}
-import org.apache.hadoop.metadata.json.TypesDef
+import org.apache.hadoop.metadata.{TypesDef, MetadataService, ITypedReferenceableInstance}
 import org.apache.hadoop.metadata.storage.Id
 import org.apache.hadoop.metadata.storage.memory.MemRepository
 import org.apache.hadoop.metadata.types.TypeSystem