ATLAS-45 Entity submit fails (suma.shivaprasad via shwethags)

release-log.txt

@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
 
 ALL CHANGES:
+ATLAS-45 Entity submit fails (suma.shivaprasad via shwethags)
 ATLAS-46 Different data directory with restart (shwethags)
 ATLAS-81 atlas debian packaing fails in maven build (vijay_k via shwethags)
 ATLAS-36 Need separate persisted properties for HTTP and HTTPS ports (jmaron)

typesystem/src/main/java/org/apache/atlas/typesystem/types/DataTypes.java

@@ -87,6 +87,14 @@ public class DataTypes {
 
         public abstract T nullValue();
 
+        @Override
+        protected T convertNull(Multiplicity m) throws AtlasException {
+            if (!m.nullAllowed()) {
+                throw new ValueConversionException.NullConversionException(m);
+            }
+
+            return nullValue();
+        }
     }
 
     public static class BooleanType extends PrimitiveType<Boolean> {
@@ -455,7 +463,7 @@ public class DataTypes {
 
         @Override
         public String convert(Object val, Multiplicity m) throws AtlasException {
-            if (val != null && (!(val instanceof String) || StringUtils.isNotBlank((CharSequence) val))) {
+            if (val != null && (!(val instanceof String) || StringUtils.isNotEmpty((CharSequence) val))) {
                 return val.toString();
             }
             return convertNull(m);

webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java

@@ -98,7 +98,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
 
     @DataProvider
     public Object[][] invalidAttrValues() {
-        return new Object[][]{{null}, {""}, {" "}};
+        return new Object[][]{{null}, {""}};
     }
 
     @Test(dataProvider = "invalidAttrValues")
@@ -109,7 +109,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
 
         try {
             createInstance(databaseInstance);
-            Assert.fail("Exptected MetadataServiceException");
+            Assert.fail("Expected AtlasServiceException");
         } catch (AtlasServiceException e) {
             Assert.assertEquals(e.getStatus(), ClientResponse.Status.BAD_REQUEST);
         }