New DocumentLabelBuilderByType and bugfix

Author: omarlarus

neo4j-json/src/main/java/org/neo4j/helpers/json/document/impl/DocumentGrapherRecursive.java

@@ -121,7 +121,11 @@ private Node upsertDocument(String key, Map inDocument, int level) {
 		//set properties
 		final Node n = node;
 
-		document.forEach((k, v) -> n.setProperty(k, v));
+		document.forEach((k, v) -> {
+			if(v != null){
+				n.setProperty(k, v);				
+			}
+		});
 
 		DocumentRelationContext context = new DocumentRelationContext();
 		context.setDocumentKey(key);

neo4j-json/src/main/java/org/neo4j/helpers/json/document/impl/DocumentLabelBuilderById.java

@@ -25,9 +25,8 @@
 import org.neo4j.helpers.json.document.DocumentLabelBuilder;
 
 /**
- * Build label from "type" property of node
+ * Build label from "id" property of node
  * @author Omar Rampado
- * FIXME implement
  *
  */
 public class DocumentLabelBuilderById implements DocumentLabelBuilder {

neo4j-json/src/main/java/org/neo4j/helpers/json/document/impl/DocumentLabelBuilderByType.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2016 LARUS Business Automation [http://www.larus-ba.it]
+ * <p>
+ * This file is part of the "LARUS Integration Framework for Neo4j".
+ * <p>
+ * The "LARUS Integration Framework for Neo4j" is licensed
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.neo4j.helpers.json.document.impl;
+
+import java.util.Map;
+
+import org.apache.commons.lang3.text.WordUtils;
+import org.neo4j.graphdb.Label;
+import org.neo4j.helpers.json.document.DocumentLabelBuilder;
+
+/**
+ * Build label from "type" property of node
+ * @author Omar Rampado
+ *
+ */
+public class DocumentLabelBuilderByType implements DocumentLabelBuilder {
+	
+	private String defaultLabel;
+	
+	/* (non-Javadoc)
+	 * @see org.neo4j.helpers.json.document.DocumentLabelBuilder#buildLabel(java.util.Map)
+	 */
+	@Override
+	public Label buildLabel(Map<String,Object> obj) {
+		String label = defaultLabel;
+
+		Object type = obj.get("type");
+		if(type != null)
+		{
+			label = String.valueOf(type);
+			label = WordUtils.capitalizeFully(label,'_',' ')
+					.replaceAll("_", "")
+					.replaceAll(" ", "");
+		}
+		
+		return Label.label(label);
+	}
+
+	@Override
+	public void setDefaultLabel(String label) {
+		defaultLabel = label;
+	}
+
+}

neo4j-json/src/test/java/org/neo4j/helpers/json/JsonHelperDefaultTest.java

@@ -107,6 +107,23 @@ public void shouldAddOnlyOneNode() {
 		Assert.assertEquals("Wrong node","Genesis", result.single().get("n.name").asString());
 
 	}
+
+	@Test
+	public void shouldNotDiscardForNull() {
+		String key = "shouldAddOnlyOneNode";
+		String json = "{\"id\": 1, "
+				+ "\"type\": \"artist\","
+				+ "\"name\": \"Genesis\","
+				+ "\"available_markets\" : [ ],"
+				+ "\"preview_url\" : null"
+				+ "}";
+		
+		session.run(CALL_UPSERT, Values.parameters( "key", key, "json", json ));
+		StatementResult result = session.run("MATCH (n {id: 1, type: 'artist'}) RETURN n.name");
+		Assert.assertEquals("Wrong node","Genesis", result.single().get("n.name").asString());
+		
+	}
+
 
 	@Test
 	public void shouldDiscard() {

neo4j-json/src/test/java/org/neo4j/helpers/json/document/impl/DocumentLabelBuilderByTypeTest.java

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2016 LARUS Business Automation [http://www.larus-ba.it]
+ * <p>
+ * This file is part of the "LARUS Integration Framework for Neo4j".
+ * <p>
+ * The "LARUS Integration Framework for Neo4j" is licensed
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.neo4j.helpers.json.document.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.neo4j.graphdb.Label;
+
+
+/**
+ * @author Omar Rampado
+ *
+ */
+public class DocumentLabelBuilderByTypeTest {
+
+	DocumentLabelBuilderByType builder;
+	
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+		builder = new DocumentLabelBuilderByType();
+	}
+
+	@Test
+	public void testBuildLabelUnderscore() {
+		builder.setDefaultLabel("NODE");
+		Map<String, Object> map = new HashMap<>();
+		map.put("type", "big_artist");
+		Label label = builder.buildLabel(map);
+		Assert.assertEquals("BigArtist", label.name());
+	}
+
+	@Test
+	public void testBuildLabelSpace() {
+		builder.setDefaultLabel("NODE");
+		Map<String, Object> map = new HashMap<>();
+		map.put("type", "big artist");
+		Label label = builder.buildLabel(map);
+		Assert.assertEquals("BigArtist", label.name());
+	}
+	
+	@Test
+	public void testBuildLabelDefault() {
+		builder.setDefaultLabel("NODE");
+		Map<String, Object> map = new HashMap<>();
+		map.put("id", "123");
+		Label label = builder.buildLabel(map);
+		Assert.assertEquals("NODE", label.name());
+	}
+}