Merge branch 'master' of git://github.com/DataInMotion/emfjson-jackson into DataInMotion-master

Author: ghillairet

src/main/java/org/emfjson/jackson/databind/deser/EObjectDeserializer.java

@@ -209,6 +209,10 @@ private void readFeature(JsonParser jp,
 			if (jp.getCurrentToken() == JsonToken.FIELD_NAME) {
 				jp.nextToken();
 			}
+			
+			if (jp.getCurrentToken() == JsonToken.VALUE_NULL) {
+				return;
+			}
 
 			if (feature instanceof EAttribute) {
 				readAttribute(jp, current, (EAttribute) feature, resource, ctxt);

src/test/java/org/emfjson/jackson/junit/TestSuite.java

@@ -1,46 +1,47 @@
-/*
- * Copyright (c) 2015 Guillaume Hillairet.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Guillaume Hillairet - initial API and implementation
- *
- */
-package org.emfjson.jackson.junit;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-import org.emfjson.jackson.junit.tests.*;
-
-@RunWith(Suite.class)
-@SuiteClasses({
-		AnnotationTest.class,
-		ContainmentTest.class,
-		CustomDeserializersTest.class,
-		CustomSerializersTest.class,
-		DynamicInstanceTest.class,
-		DynamicMapTest.class,
-		DynamicPackageTest.class,
-		EnumTest.class,
-		ExternalReferencesTest.class,
-		FeatureMapTest.class,
-		GenericTest.class,
-		IdTest.class,
-		JacksonOptionTest.class,
-		MapTest.class,
-		ModuleTest.class,
-		NoTypeTest.class,
-		PolymorphicTest.class,
-		ProxyAttributeTest.class,
-		ReaderTest.class,
-		ReferenceTest.class,
-		UuidLoadTest.class,
-		UuidSaveTest.class,
-		ValueTest.class
-})
-public class TestSuite {}
+/*
+ * Copyright (c) 2015 Guillaume Hillairet.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Guillaume Hillairet - initial API and implementation
+ *
+ */
+package org.emfjson.jackson.junit;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import org.emfjson.jackson.junit.tests.*;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+		AnnotationTest.class,
+		ContainmentTest.class,
+		CustomDeserializersTest.class,
+		CustomSerializersTest.class,
+		DynamicInstanceTest.class,
+		DynamicMapTest.class,
+		DynamicPackageTest.class,
+		EnumTest.class,
+		ExternalReferencesTest.class,
+		FeatureMapTest.class,
+		GenericTest.class,
+		IdTest.class,
+		JacksonOptionTest.class,
+		MapTest.class,
+		ModuleTest.class,
+		NoTypeTest.class,
+		PolymorphicTest.class,
+		ProxyAttributeTest.class,
+		ReaderTest.class,
+		ReferenceTest.class,
+		UuidLoadTest.class,
+		UuidSaveTest.class,
+		ValueTest.class,
+		NullValueInBetweenTest.class
+})
+public class TestSuite {}

src/test/java/org/emfjson/jackson/junit/tests/NullValueInBetweenTest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016 Data In Motion UG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Juergen Albert - initial API and implementation
+ *
+ */
+package org.emfjson.jackson.junit.tests;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.emfjson.jackson.junit.model.PrimaryObject;
+import org.emfjson.jackson.junit.support.TestSupport;
+import org.junit.Test;
+
+public class NullValueInBetweenTest extends TestSupport {
+
+	@Test
+	public void testSaveOneRootObjectWithAttributes() throws IOException {
+		
+		Resource resource = resourceSet.createResource(URI.createURI("src/test/resources/tests/test-load-null-value-in-between.json"));
+		assertNotNull(resource);
+
+		resource.load(null);
+		
+		assertTrue(!resource.getContents().isEmpty());
+		PrimaryObject type = (PrimaryObject) resource.getContents().get(0);
+		
+		assertNull(type.getName());
+		assertNotNull(type.getFeatureMapAttributeType1());
+		assertNotNull(type.getFeatureMapAttributeType2());
+	}
+
+}

src/test/resources/tests/test-load-null-value-in-between.json

@@ -0,0 +1,8 @@
+{
+  "eClass": "http://www.emfjson.org/jackson/model#//PrimaryObject",
+  "name": null,
+  "featureMapAttributeType1": "Hello",
+  "featureMapAttributeType2": "World"
+}
+
+