Commit 8cac97e5 by Aaron Dossett

add isEmpty to TypesDef and check in MetadataService

parent 28139b40
...@@ -94,7 +94,7 @@ public class DefaultMetadataService implements MetadataService { ...@@ -94,7 +94,7 @@ public class DefaultMetadataService implements MetadataService {
Preconditions.checkArgument(!typeDefinition.equals(""), "type definition cannot be an empty string"); Preconditions.checkArgument(!typeDefinition.equals(""), "type definition cannot be an empty string");
TypesDef typesDef = TypesSerialization.fromJson(typeDefinition); TypesDef typesDef = TypesSerialization.fromJson(typeDefinition);
if(typesDef.classTypesAsJavaList().size() == 0) if(typesDef.isEmpty())
throw new MetadataException("Invalid type definition"); throw new MetadataException("Invalid type definition");
Map<String, IDataType> typesAdded = typeSystem.defineTypes(typesDef); Map<String, IDataType> typesAdded = typeSystem.defineTypes(typesDef);
......
...@@ -58,4 +58,8 @@ case class TypesDef(enumTypes: Seq[EnumTypeDefinition], ...@@ -58,4 +58,8 @@ case class TypesDef(enumTypes: Seq[EnumTypeDefinition],
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
classTypes.asJava classTypes.asJava
} }
def isEmpty() = {
enumTypes.isEmpty & structTypes.isEmpty & traitTypes.isEmpty & classTypes.isEmpty
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment