ATLAS-2327: updated V1 to V2 conversion with addition of validation of attribute values

repository/src/main/java/org/apache/atlas/repository/converters/AtlasStructFormatConverter.java

@@ -246,10 +246,15 @@ public class AtlasStructFormatConverter extends AtlasAbstractFormatConverter {
 
                 AtlasType            attrType      = attr.getAttributeType();
                 AtlasFormatConverter attrConverter = converterRegistry.getConverter(attrType.getTypeCategory());
-                Object               v1Value       = attributes.get(attr.getName());
+                Object               v1Value       = attributes.get(attrName);
+
+                if (attrType.isValidValue(v1Value)) {
                     Object v2Value = attrConverter.fromV1ToV2(v1Value, attrType, context);
 
-                ret.put(attr.getAttributeDef().getName(), v2Value);
+                    ret.put(attrName, v2Value);
+                } else {
+                    throw new AtlasBaseException(AtlasErrorCode.INSTANCE_CRUD_INVALID_PARAMS, attrName + "=" + v1Value);
+                }
             }
         }
 

webapp/src/main/java/org/apache/atlas/web/resources/EntityResource.java

@@ -138,13 +138,13 @@ public class EntityResource {
                 perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, "EntityResource.submit()");
             }
 
-            String entities = Servlets.getRequestPayload(request);
+            entityJson = Servlets.getRequestPayload(request);
 
             //Handle backward compatibility - if entities is not JSONArray, convert to JSONArray
             String[] jsonStrings;
 
             try {
-                ArrayNode jsonEntities = AtlasJson.parseToV1ArrayNode(entities);
+                ArrayNode jsonEntities = AtlasJson.parseToV1ArrayNode(entityJson);
 
                 jsonStrings = new String[jsonEntities.size()];
 
@@ -154,11 +154,11 @@ public class EntityResource {
             } catch (IOException e) {
                 jsonStrings = new String[1];
 
-                jsonStrings[0] = entities;
+                jsonStrings[0] = entityJson;
             }
 
             if (LOG.isDebugEnabled()) {
-                LOG.debug("submitting entities: count={}; entities-json={}", jsonStrings.length, entities);
+                LOG.debug("submitting entities: count={}; entities-json={}", jsonStrings.length, entityJson);
             }
 
             AtlasEntitiesWithExtInfo entitiesInfo     = restAdapters.toAtlasEntities(jsonStrings);